Merge remote-tracking branch 'origin/develop' into zhaoyun

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java

@@ -255,6 +255,8 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
             encounterDiagnosis.setDiagnosisDesc(saveDiagnosisChildParam.getDiagnosisDesc()); // 诊断描述
             encounterDiagnosis.setIptDiseTypeCode(saveDiagnosisChildParam.getIptDiseTypeCode()); // 患者疾病诊断类型代码
             encounterDiagnosis.setDoctor(saveDiagnosisChildParam.getDiagnosisDoctor());
+            encounterDiagnosis.setClassification(saveDiagnosisChildParam.getClassification()); // 分类
+            encounterDiagnosis.setName(saveDiagnosisChildParam.getName()); // 病名
             encounterDiagnosis.setDiagnosisTime(saveDiagnosisChildParam.getDiagnosisTime());
             encounterDiagnosis.setOnsetDate(saveDiagnosisChildParam.getOnsetDate());
             // 设置租户ID，避免数据库约束错误

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/DiagnosisQueryDto.java

@@ -106,4 +106,9 @@ public class DiagnosisQueryDto {
      */
     private Integer hasInfectiousReport;
 
+    /**
+     * 分类（西医/中医等）
+     */
+    private String classification;
+
 }

healthlink-his-server/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml

@@ -174,4 +174,5 @@
              ) AS counts
     </select>
 
-</mapper>
+</mapper>
+               T1.classification,