bug402:住院医生站诊断录入：点击保存诊断后，列表出现重复记录且部分条目元数据缺失.

bug405: 住院医生工作站：临床医嘱保存成功后，医嘱条目仍处于可编辑状态（未锁定展示）

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

@@ -39,9 +39,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.*;
 
-import static com.openhis.common.constant.CommonConstants.FieldName.DeleteFlag;
 import static com.openhis.common.enums.ReportCardStatus.SUBMITTED;
-import static java.time.LocalDateTime.now;
 
 /**
  * 医生站-诊断 应用实现类
@@ -253,6 +251,9 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
             encounterDiagnosis.setMedTypeCode(saveDiagnosisChildParam.getMedTypeCode());// 医疗类型
             encounterDiagnosis.setDiagnosisDesc(saveDiagnosisChildParam.getDiagnosisDesc()); // 诊断描述
             encounterDiagnosis.setIptDiseTypeCode(saveDiagnosisChildParam.getIptDiseTypeCode()); // 患者疾病诊断类型代码
+            encounterDiagnosis.setDoctor(saveDiagnosisChildParam.getDiagnosisDoctor());
+            encounterDiagnosis.setDiagnosisTime(saveDiagnosisChildParam.getDiagnosisTime());
+            encounterDiagnosis.setOnsetDate(saveDiagnosisChildParam.getOnsetDate());
             // 设置租户ID，避免数据库约束错误
             encounterDiagnosis.setTenantId(SecurityUtils.getLoginUser().getTenantId());
             // 设置创建人，避免数据库约束错误

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

@@ -91,4 +91,9 @@ public class DiagnosisQueryDto {
      */
     private Date diagnosisTime;
 
+    /**
+     * 诊断医生
+     */
+    private String diagnosisDoctor;
+
 }

openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml

@@ -133,7 +133,8 @@
                T2.verification_status_enum,
                T2.yb_no,
                T1.onset_date AS onsetDate,
-               T1.diagnosis_time AS diagnosisTime
+               T1.diagnosis_time AS diagnosisTime,
+               T1.doctor AS diagnosisDoctor
         FROM adm_encounter_diagnosis AS T1
                  LEFT JOIN cli_condition AS T2 ON T2.ID = T1.condition_id
             AND T2.delete_flag = '0' AND T2.tcm_flag = 0