46 门诊医生站-》开立诊断：优化 修改数据库中一些字段不能为null

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java

@@ -260,7 +260,8 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
                     .eq(EncounterDiagnosis::getEncounterId, encounterId)
                     .set(EncounterDiagnosis::getMaindiseFlag, 0));
         }
-
+        Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
+        String username = SecurityUtils.getUsername();
         // 保存诊断管理
         Condition condition;
         for (SaveDiagnosisChildParam saveDiagnosisChildParam : diagnosisChildList) {
@@ -277,6 +278,17 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
             condition.setYbNo(saveDiagnosisChildParam.getYbNo());
             condition.setRecordedDatetime(new Date());
             condition.setRecorderId(SecurityUtils.getLoginUser().getPractitionerId());// 记录人
+
+            if(condition.getCreateBy() == null){
+                condition.setCreateBy(username);
+            }
+            condition.setUpdateBy(username);
+
+            condition.setTenantId(tenantId);
+            if(condition.getCreateTime() == null){
+                condition.setCreateTime(new Date());
+            }
+            condition.setUpdateTime(new Date());
             iConditionService.saveOrUpdate(condition);
             saveDiagnosisChildParam.setConditionId(condition.getId());
         }
@@ -309,6 +321,16 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
                     encounterDiagnosis.setDoctor(saveDiagnosisChildParam.getDiagnosisDoctor());
                     encounterDiagnosis.setClassification(saveDiagnosisChildParam.getClassification());
                     encounterDiagnosis.setName(saveDiagnosisChildParam.getName());
+                    encounterDiagnosis.setTenantId(tenantId);
+                    encounterDiagnosis.setLongTermFlag(saveDiagnosisChildParam.getLongTermFlag());
+                    if(encounterDiagnosis.getCreateBy() == null){
+                        encounterDiagnosis.setCreateBy(username);
+                    }
+                    encounterDiagnosis.setUpdateBy(username);
+                    if(encounterDiagnosis.getCreateTime() == null){
+                        encounterDiagnosis.setCreateTime(new Date());
+                    }
+                    encounterDiagnosis.setUpdateTime(new Date());
                     iEncounterDiagnosisService.saveOrUpdate(encounterDiagnosis);
                     i++;
                 }
@@ -325,6 +347,16 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
                 encounterDiagnosis.setDoctor(saveDiagnosisChildParam.getDiagnosisDoctor());
                 encounterDiagnosis.setClassification(saveDiagnosisChildParam.getClassification());
                 encounterDiagnosis.setName(saveDiagnosisChildParam.getName());
+                encounterDiagnosis.setTenantId(tenantId);
+                encounterDiagnosis.setLongTermFlag(saveDiagnosisChildParam.getLongTermFlag());
+                if(encounterDiagnosis.getCreateBy() == null){
+                    encounterDiagnosis.setCreateBy(username);
+                }
+                encounterDiagnosis.setUpdateBy(username);
+                if(encounterDiagnosis.getCreateTime() == null){
+                    encounterDiagnosis.setCreateTime(new Date());
+                }
+                encounterDiagnosis.setUpdateTime(new Date());
                 iEncounterDiagnosisService.saveOrUpdate(encounterDiagnosis);
             }
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisChildParam.java

@@ -94,6 +94,6 @@ public class SaveDiagnosisChildParam {
      */
     private String updateConditionId;
 
-    private String longTermFlag;
+    private Integer longTermFlag;
 
 }

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java

@@ -81,5 +81,10 @@ public class EncounterDiagnosis extends HisBaseEntity {
      */
     private String classification;
 
+    /**
+     * 长诊断标识
+     */
+    private Integer longTermFlag;
+
 
 }