修改身份证信息

src/main/java/cn/hnthyy/thmz/Utils/IDCardUtil.java

@@ -124,6 +124,7 @@ public class IDCardUtil {
         hashtable.put("71", "台湾");
         hashtable.put("81", "香港");
         hashtable.put("82", "澳门");
+        hashtable.put("83", "台湾");
         hashtable.put("91", "国外");
         return hashtable;
     }

src/main/java/cn/hnthyy/thmz/controller/ZyActpatientController.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -260,7 +261,16 @@ public class ZyActpatientController {
             }
             resultMap.put("code", 0);
             resultMap.put("message", "根据病人门诊id或者住院号查询病人信息成功");
-            resultMap.put("data", zyActpatientService.queryZyActpatientByInpatientNoOrMzNO(zyActpatient));
+            List<ZyActpatient> list=zyActpatientService.queryZyActpatientByInpatientNoOrMzNO(zyActpatient);
+            list.stream().forEach(z->{
+                if(StringUtils.isNotBlank(z.getWard())){
+                    z.setWardName(zdUnitCodeService.queryDeptNameByIdInCache(z.getWard()));
+                }
+                if(StringUtils.isNotBlank(z.getZkDept())){
+                    z.setZkDeptName(zdUnitCodeService.queryDeptNameByIdInCache(z.getZkDept()));
+                }
+            });
+            resultMap.put("data", list);
             resultMap.put("total", zyActpatientService.queryCountByInpatientNoOrMzNO(zyActpatient));
             return resultMap;
         } catch (Exception e) {

src/main/java/cn/hnthyy/thmz/entity/his/ZyActpatient.java

@@ -197,8 +197,10 @@ public class ZyActpatient extends PageBean implements Comparable<ZyActpatient> {
     private String pathologyDiagComment;//病理诊断名称
     private String fileStatus;//
 
-
-
+    //病区名称
+    private String wardName;
+    //小病室名称
+    private String zkDeptName;
 
 
     // zy_actpatient 在院病人  zy_inactpatient 出院病人表

src/main/java/cn/hnthyy/thmz/mapper/his/ZyActpatientMapper.java

@@ -154,7 +154,7 @@ public interface ZyActpatientMapper {
                     "         admiss_diag_str," +
                     "         admiss_diag," +
                     "         admiss_date," +
-                    "         zk_dept,"+
+                    "         isnull(zk_dept,small_dept) zk_dept,"+
                     "         sex," +
                     "         zy_serial_no," +
                     "         mz_no," +
@@ -173,7 +173,7 @@ public interface ZyActpatientMapper {
             " and name like #{name}",
             "</when>",
             "<when test='ward!=null'>",
-            " and name = #{ward}",
+            " and ward = #{ward}",
             "</when>",
             "<when test='zkDept!=null'>",
             " and zk_dept = #{zkDept}",
@@ -216,7 +216,7 @@ public interface ZyActpatientMapper {
             " and name like #{name}",
             "</when>",
             "<when test='ward!=null'>",
-            " and name = #{ward}",
+            " and ward = #{ward}",
             "</when>",
             "<when test='zkDept!=null'>",
             " and zk_dept = #{zkDept}",

src/main/resources/static/js/actpatient.js

@@ -8,6 +8,9 @@ $(function () {
     //默认光标在卡号输入框
     $("#cardNo").focus();
     init_daterangepicker();
+    //$('#reportrange span').html('1970-01-01 - 1970-01-01');
+   // var firstDate= new Date("1970-01-01");
+    $('#reportrange span').html(moment(new Date('2012')).startOf('year').format('YYYY-MM-DD') + ' - ' + moment(new Date()).format("YYYY-MM-DD"));
     initSelect();
     initFeeTable();
     //卡号输入改变事件
@@ -271,7 +274,7 @@ function initFeeTable() {
                 align: "center",
                 valign: 'middle',
                 formatter: function (value, row, index) {
-                    return Math.abs(value);
+                    return Math.abs(value).toFixed(2);;
                 }
             }, {
                 field: 'totalCharge',
@@ -279,15 +282,15 @@ function initFeeTable() {
                 align: "center",
                 valign: 'middle',
                 formatter: function (value, row, index) {
-                    return Math.abs(value);
+                    return Math.abs(value).toFixed(2);;
                 }
             }, {
-                field: 'ward',
+                field: 'wardName',
                 title: '病区',
                 align: "center",
                 valign: 'middle',
             }, {
-                field: 'zkDept',
+                field: 'zkDeptName',
                 title: '小科室',
                 align: "center",
                 valign: 'middle',

src/main/resources/static/js/custom-from-min.js

@@ -1144,7 +1144,7 @@ function initDaterangepickerWithId(id) {
         minDate: '2012-01-01',
         //maxDate: nowString(),
         dateLimit: {
-            days: 1200
+            days: 3600
         },
         showDropdowns: true,
         showWeekNumbers: true,