Merge branch 'master' into 'master'

增加门诊病历查询

See merge request lighter/web-server!15

src/main/java/thyyxxk/webserver/controller/medicalinsurance/SiManageController.java

@@ -203,5 +203,10 @@ public class SiManageController {
         return service.selectSetlPrescription(mdtrtId);
     }
 
+    @GetMapping("/selectMzBl")
+    public ResultVo<Map<String, Object>> selectMzBl(@RequestParam("patNo") String patNo, @RequestParam("times") int times) {
+        return service.selectMzBl(patNo, times);
+    }
+
 
 }

src/main/java/thyyxxk/webserver/dao/his/medicalinsurance/SiManageDao.java

@@ -235,4 +235,20 @@ public interface SiManageDao {
             " opt_time as optTime, chrgitm_lv_name as chrgitmLvName " +
             " from t_si_setl_fee_detl where mdtrt_id = #{mdtrtId} ")
     List<Map<String, Object>> selectSetlPrescription(@Param("mdtrtId") String mdtrtId);
+
+    @Select(" select patient_id as patientId, times, emr_no as emrNo, visit_date as visitDate, " +
+            " emr_chief_complaint as emrCC, emr_hpi as emrHpi, emr_ps as emrPs, " +
+            " emr_pe as emrPe, emr_fzjc as emrFzjc, emr_bzfx as emrBzfx, emr_zf as emrZf, " +
+            " emr_process as emrProcess, personal_history as personalHistory, family_history as familyHistory, " +
+            " obsterical_history as obstericalHistory, weight, temperature, sphygmus, breathe," +
+            " pressure_high as pressureHigh, pressure_floor as pressureFloor, " +
+            " pressure_high_left as pressureHighLeft, pressure_floor_left as pressureFloorLeft, " +
+            " tentative_diagnosis as tentativeDiagnosis, " +
+            " rtrim(isnull(e.name, '其他')) as doctorName, rtrim(isnull(z.name, '其他')) as deptName " +
+            " from mz_bl_record " +
+            " left join zy_dept_code z on dept_code = z.code" +
+            " left join a_employee_mi e on doctor_code = e.code " +
+            " where patient_id = #{patNo} and times = #{times} ")
+    Map<String, Object> selectMzBl(@Param("patNo") String patNo, @Param("times") int times);
+
 }

src/main/java/thyyxxk/webserver/service/medicalinsurance/SiManageService.java

@@ -694,4 +694,9 @@ public class SiManageService {
         List<Map<String, Object>> result = dao.selectSetlPrescription(mdtrtId);
         return ResultVoUtil.success(result);
     }
+
+    public ResultVo<Map<String, Object>> selectMzBl(String patNo, int times){
+        Map<String, Object> result = dao.selectMzBl(patNo, times);
+        return ResultVoUtil.success(result);
+    }
 }