Selaa lähdekoodia

新增删除开关

0027005599 2 vuotta sitten
vanhempi
säilyke
e62022f9ee

+ 2 - 2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/afterwaring/XCFYDataTransferService.java

@@ -159,7 +159,7 @@ public class XCFYDataTransferService {
         }, new TransferDataCallFunction() {
             @Override
             public Boolean transferData(Map<String, Object> dataMap) throws Exception {
-                if(null != openStr && Constant.SWITCH_OPEN.equals(openStr)) {
+                if(null != openStr && Constant.SWITCH_OPEN.equals(openStr.toString())) {
                     prescriptionOrderService.lambdaUpdate().eq(PrescriptionOrder::getInpOutpatientNumber, vistNo).remove();
                 }
                 return true;
@@ -195,7 +195,7 @@ public class XCFYDataTransferService {
         }, new TransferDataCallFunction() {
             @Override
             public Boolean transferData(Map<String, Object> dataMap) throws Exception {
-                if(null != openStr && Constant.SWITCH_OPEN.equals(openStr)) {
+                if(null != openStr && Constant.SWITCH_OPEN.equals(openStr.toString())) {
                     operationService.lambdaUpdate().eq(Operation::getVisitNo, visitNo).remove();
                 }
                 return true;

+ 1 - 1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/job/XCFYDataV_MEDICAL_RECORD_HOMEPAGEJob.java

@@ -66,7 +66,7 @@ public class XCFYDataV_MEDICAL_RECORD_HOMEPAGEJob implements Job {
             public Boolean transferData(Map<String, Object> dataMap) throws Exception {
 
                 String zyh = dataMap.get("ZYH").toString();
-                if (Constant.SWITCH_OPEN.equals(openStr)) {
+                if (Constant.SWITCH_OPEN.equals(openStr.toString())) {
                     medicalRecordHomepageService.lambdaUpdate().eq(MedicalRecordHomepage::getZyh, zyh).remove();
                 }
                 transferMedicalRecordHomePage(zyh, dischargeMethodMap);

+ 3 - 3
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/job/XCFYDatav_master_admission_billJob.java

@@ -121,7 +121,7 @@ public class XCFYDatav_master_admission_billJob implements Job {
                     log.error("hisid:{} 未查询到住院结算清单", hisId);
                     return false;
                 }
-                if(null != openStr && Constant.SWITCH_OPEN.equals(openStr)) {
+                if(null != openStr && Constant.SWITCH_OPEN.equals(openStr.toString())) {
                     masterAdmissionBillService.lambdaUpdate().eq(MasterAdmissionBill::getHisid, hisId).remove();
                 }
                 Object diagCode = dataMap.get("ADMISSION_DISEASE_ID");
@@ -264,7 +264,7 @@ public class XCFYDatav_master_admission_billJob implements Job {
             }, new TransferDataCallFunction() {
                 @Override
                 public Boolean transferData(Map<String, Object> dataMap) throws Exception {
-                    if(Constant.SWITCH_OPEN.equals(openStr)) {
+                    if(Constant.SWITCH_OPEN.equals(openStr.toString())) {
                         hospitalizatioSettleDetailService.lambdaUpdate().eq(HospitalizatioSettleDetail::getHisid, hisId).remove();
                     }
                     return true;
@@ -308,7 +308,7 @@ public class XCFYDatav_master_admission_billJob implements Job {
         }, new TransferDataCallFunction() {
             @Override
             public Boolean transferData(Map<String, Object> dataMap) throws Exception {
-                if(null != openStr && Constant.SWITCH_OPEN.equals(openStr)) {
+                if(null != openStr && Constant.SWITCH_OPEN.equals(openStr.toString())) {
                     medicalRecordHomepageService.lambdaUpdate().eq(MedicalRecordHomepage::getZyh, zyh).remove();
                 }
                 return true;

+ 2 - 2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/job/XCFYDatav_outpatient_settle_billJob.java

@@ -109,7 +109,7 @@ public class XCFYDatav_outpatient_settle_billJob implements Job {
                         log.error("hisid:{} 未查询到门诊结算清单", hisId);
                         return false;
                     }
-                    if(null != openStr && Constant.SWITCH_OPEN.equals(openStr)) {
+                    if(null != openStr && Constant.SWITCH_OPEN.equals(openStr.toString())) {
                         outpatientSettleBillService.lambdaUpdate().eq(OutpatientSettleBill::getHisid, hisId).remove();
                     }
                     dataMap.put("CREATE_BY", "auto");
@@ -205,7 +205,7 @@ public class XCFYDatav_outpatient_settle_billJob implements Job {
         }, new TransferDataCallFunction() {
             @Override
             public Boolean transferData(Map<String, Object> dataMap) throws Exception {
-                if(null != openStr && Constant.SWITCH_OPEN.equals(openStr)) {
+                if(null != openStr && Constant.SWITCH_OPEN.equals(openStr.toString())) {
                     outpatientSettlementDetailsService.lambdaUpdate().eq(OutpatientSettlementDetails::getHisid, hisId).remove();
                 }
                 return true;

+ 1 - 1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/job/XCFYDatav_outpatient_settle_detailsJob.java

@@ -79,7 +79,7 @@ public class XCFYDatav_outpatient_settle_detailsJob implements Job {
                 @Override
                 public Boolean transferData(Map<String, Object> dataMap) throws Exception {
                     String hisid = dataMap.get("HISID").toString();
-                    if(null != openStr && Constant.SWITCH_OPEN.equals(openStr)) {
+                    if(null != openStr && Constant.SWITCH_OPEN.equals(openStr.toString())) {
                         outpatientSettlementDetailsService.lambdaUpdate().eq(OutpatientSettlementDetails::getHisid, hisid).remove();
                     }
                     dataMap.put("CREATE_BY", "auto");