Merge branch 'master' into 淮海科技

src/main/java/thyyxxk/webserver/dao/his/inpatient/PatientDao.java

@@ -66,6 +66,7 @@ public interface PatientDao {
             "admissPhysician=rtrim(a.admiss_physician),b.psn_cert_type, " +
             "insutype=(select top 1 insutype from t_si_pat_info with(nolock) where pat_no=#{inpatientNo} and " +
             "times=a.admiss_times order by ledger_sn desc), " +
+            "psnIdetType=(select max(psn_idet_type) from t_si_pat_info with(nolock) where pat_no=#{inpatientNo} and times=a.admiss_times), " +
             "admissPhysicianName=rtrim((select name FROM a_employee_mi WHERE code = a.admiss_physician)), " +
             "referPhysician=rtrim(a.refer_physician), " +
             "referPhysicianName=rtrim((select name FROM a_employee_mi WHERE code = a.refer_physician)), " +

src/main/java/thyyxxk/webserver/entity/inpatient/patient/Patient.java

@@ -77,6 +77,8 @@ public class Patient {
     private String medTypeName;
     private String insutype;
     private String insutypeName;
+    private String psnIdetType;
+    private String psnIdetTypeName;
     private Integer admdvs;
     private Integer[] admdvsCascader;
     private String matnType; // 生育类别

src/main/java/thyyxxk/webserver/service/inpatient/PatientService.java

@@ -17,6 +17,7 @@ import thyyxxk.webserver.constants.Capacity;
 import thyyxxk.webserver.constants.sidicts.Insutype;
 import thyyxxk.webserver.constants.sidicts.MedType;
 import thyyxxk.webserver.constants.sidicts.PsnCertType;
+import thyyxxk.webserver.constants.sidicts.PsnIdetType;
 import thyyxxk.webserver.dao.his.inpatient.PatientDao;
 import thyyxxk.webserver.dao.his.inpatient.Routines;
 import thyyxxk.webserver.dao.his.zhuyuanyisheng.YiZhuLuRuDao;
@@ -230,6 +231,7 @@ public class PatientService {
     private void setExpenseInformation(@NotNull Patient data) {
         data.setMedTypeName(MedType.getName(data.getMedType()));
         data.setInsutypeName(Insutype.getName(data.getInsutype()));
+        data.setPsnIdetTypeName(PsnIdetType.getName(data.getPsnIdetType()));
         data.setDutyNurseName(userCache.getEmployeeName(data.getDutyNurse()));
 
         HuanZheFeiYong feiYongZhanBi = yiZhuLuRuDao.feiYongXinXi(data.getInpatientNo(), data.getAdmissTimes(), data.getLedgerSn());