opneedInfo update

center-order/app/base/service/impl/dbneed/diagnosisSve.js

@@ -96,7 +96,6 @@ class DiagnosisService extends ServiceBase {
     let res = await this.dao.findAndCountAll(query)
     let res = await this.dao.findAndCountAll(query)
     return system.getResultSuccess(res);
     return system.getResultSuccess(res);
   }
   }
-<<<<<<< HEAD
   // 过滤数组 筛选出选择过的资质
   // 过滤数组 筛选出选择过的资质
   checkIsChoice(obj) {
   checkIsChoice(obj) {
     console.log(obj)
     console.log(obj)
@@ -105,12 +104,6 @@ class DiagnosisService extends ServiceBase {
   async diagnosisDetail(pobj) {
   async diagnosisDetail(pobj) {
     if(!pobj.actionBody.diagnosisNo) {
     if(!pobj.actionBody.diagnosisNo) {
         return system.getResultFail(-5008, "诊断单号不能为空");
         return system.getResultFail(-5008, "诊断单号不能为空");
-=======
-
-  async diagnosisDetail (pobj) {
-    if (!pobj.actionBody.diagnosisNo) {
-      return system.getResultFail(-5008, "诊断单号不能为空");
->>>>>>> 12fbd04b2d9c1d2ff1e7164a1cfe49808f252f60
     }
     }
     let diagnosisResult = await this.dao.findOneByDiagnosisNo(pobj.actionBody.diagnosisNo)
     let diagnosisResult = await this.dao.findOneByDiagnosisNo(pobj.actionBody.diagnosisNo)
     diagnosisResult.needQualifications_pic = diagnosisResult.qualifications_pic.filter(this.checkIsChoice);
     diagnosisResult.needQualifications_pic = diagnosisResult.qualifications_pic.filter(this.checkIsChoice);