住院功能开发入院

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

@@ -0,0 +1,114 @@
+package cn.hnthyy.thmz.entity.his;
+
+
+import lombok.Data;
+import java.util.Date;
+
+/**
+ * ADT动态表
+ *
+ * @author 大狼狗 2020-11-26
+ */
+@Data
+public class ZyAdt {
+
+
+    /**
+     * 住院号
+     */
+    private String inpatientNo;
+
+    /**
+     * 住院次数
+     */
+    private Integer admissTimes;
+
+    /**
+     * 转床次数, 入院出院为 0
+     */
+    private Integer transTimes;
+
+    /**
+     * 入院日期
+     */
+    private Date admissDate;
+
+    /**
+     * 出院日期
+     */
+    private Date disDate;
+
+    /**
+     * 转床日期
+     */
+    private Date transDate;
+
+    /**
+     * 原科室
+     */
+    private String origDept;
+
+    /**
+     * 原病房
+     */
+    private String origWard;
+
+    /**
+     * 原房间
+     */
+    private String origRoom;
+
+    /**
+     * 原床位
+     */
+    private String origBed;
+
+    /**
+     * 现科室
+     */
+    private String currDept;
+
+    /**
+     * 现病房
+     */
+    private String currWard;
+
+    /**
+     * 现房间
+     */
+    private String currRoom;
+
+    /**
+     * 现床位
+     */
+    private String currBed;
+
+    /**
+     * 3转科病区4转科5转区6费用变7费用不变
+     */
+    private String mark;
+
+    /**
+     * 住院流水号
+     */
+    private String zySerialNo;
+
+    /**
+     * [refer_physician]
+     */
+    private String referPhysician;
+
+    /**
+     * [consult_physician]
+     */
+    private String consultPhysician;
+
+    /**
+     * [dept_director]
+     */
+    private String deptDirector;
+
+    public ZyAdt() {
+    }
+
+}

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

@@ -28,7 +28,7 @@ public class ZyLedgerFile {
     private Integer ledgerSn;
 
     /**
-    * [account_date]
+    * 结算日期
     */
     private Date accountDate;
 
@@ -243,7 +243,7 @@ public class ZyLedgerFile {
     private String deptCode;
 
     /**
-    * [cash_date]
+    * 实际交费日期
     */
     private Date cashDate;
 

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

@@ -0,0 +1,26 @@
+package cn.hnthyy.thmz.mapper.his;
+
+import cn.hnthyy.thmz.entity.his.ZyAdt;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Param;
+
+public interface ZyAdtMapper {
+    /**
+     * 根据住院号与住院次数删除流转记录
+     * @param inpatientNo
+     * @param admissTimes
+     * @return
+     */
+    @Delete(" DELETE FROM zy_adt WHERE inpatient_no =#{inpatientNo} AND admiss_times =4 ")
+    int deleteZyAdt(@Param("inpatientNo") String inpatientNo,@Param("admissTimes") Integer admissTimes);
+
+    /**
+     * 入库流转记录
+     * @param zyAdt
+     * @return
+     */
+    @Insert("INSERT INTO zy_adt ( zy_serial_no , inpatient_no , admiss_times , trans_times , admiss_date , curr_ward , curr_dept , curr_room , curr_bed , mark ) " +
+            "VALUES ( #{zySerialNo} , #{inpatientNo} , #{admissTimes} , #{trans_times} , #{admissDate} , #{currWard} , #{currDept} , #{currRoom} , #{currBed} , #{mark}) ")
+    int inserZyAdt(ZyAdt zyAdt);
+}

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

@@ -33,8 +33,11 @@ public interface ZyConfigMapper {
     @Update({"<script>",
             "update zy_config ",
             "<trim prefix='set' prefixOverrides=',' suffix=' where item_no =1 ' >",
+            "<when test='inpatientNo!=null'>",
+            "inpatient_no =#{inpatientNo,jdbcType=INTEGER}",
+            "</when>",
             "<when test='zySerialNo!=null'>",
-            "zy_serial_no =#{zySerialNo,jdbcType=INTEGER}",
+            ",zy_serial_no =#{zySerialNo,jdbcType=INTEGER}",
             "</when>",
             "<when test='delNo!=null'>",
             ",del_no =#{delNo,jdbcType=INTEGER}",

src/main/resources/static/js/accepting.js

@@ -22,7 +22,7 @@ $(function () {
     });
 
     initChequeType();
-    initStatus();
+   // initStatus();
 });
 
 
@@ -262,11 +262,11 @@ function listDepositFile() {
                 valign: 'middle'
             },{
                 field: 'depoDate',
-                title: '日期',
+                title: '时间',
                 align: "center",
                 valign: 'middle',
                 formatter: function (value, row, index) {
-                    return format(value, "yyyy-MM-dd");
+                    return format(value, "yyyy-MM-dd HH:mm:ss");
                 }
             }, {
                 field: 'statusName',

src/main/resources/templates/accepting.html

@@ -203,20 +203,21 @@
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span>
                 </button>
-                <h4 class="modal-title">缴费退费</h4>
+                <!--<h4 class="modal-title">缴费退费</h4>-->
+                <h4 class="modal-title">缴费</h4>
             </div>
             <div class="modal-body">
                 <form class="form-horizontal form-label-left" novalidate autocomplete="off">
-                    <div class="item form-group">
-                        <label class="control-label col-md-4 col-sm-4 col-xs-12" for="status">事务 <span
-                                class="required">*</span>
-                        </label>
-                        <div class="col-md-6 col-sm-6 col-xs-12">
-                            <select class="form-control selectpicker show-tick" required="required"  title="请选择"
-                                    id="status">
-                            </select>
-                        </div>
-                    </div>
+                    <!--<div class="item form-group">-->
+                        <!--<label class="control-label col-md-4 col-sm-4 col-xs-12" for="status">事务 <span-->
+                                <!--class="required">*</span>-->
+                        <!--</label>-->
+                        <!--<div class="col-md-6 col-sm-6 col-xs-12">-->
+                            <!--<select class="form-control selectpicker show-tick" required="required"  title="请选择"-->
+                                    <!--id="status">-->
+                            <!--</select>-->
+                        <!--</div>-->
+                    <!--</div>-->
                     <div class="item form-group">
                         <label class="control-label col-md-4 col-sm-4 col-xs-12" for="depoType">收款方式 <span
                                 class="required">*</span>