增加检查检验项目的执行地点

src/main/java/cn/hnthyy/thmz/entity/his/zd/JcZdItem.java

@@ -41,5 +41,5 @@ public class JcZdItem extends PageBean implements Serializable {
     //组编码
     private String groupCode;
     //执行地址
-    private BigDecimal execAddress;
+    private String execAddress;
 }

src/main/java/cn/hnthyy/thmz/entity/his/zd/JyZdItem.java

@@ -59,5 +59,5 @@ public class JyZdItem extends PageBean implements Serializable {
     //部位编码
     private String bwCode;
     //执行地址
-    private BigDecimal execAddress;
+    private String execAddress;
 }

src/main/java/cn/hnthyy/thmz/mapper/his/zd/JcZdItemMapper.java

@@ -12,7 +12,7 @@ public interface JcZdItemMapper {
      * @return
      */
     @Select("select rtrim(code) code,name,rtrim(class) class_code,py_code,d_code wb_code,rtrim(del_flag) del_flag,rtrim(exec_unit) exec_unit,rtrim(tj_flag) tj_flag," +
-            "rtrim(zy_flag) zy_flag,zy_order_code,rtrim(mz_flag) mz_flag,mz_code,bw_code,group_code from jc_zd_item WITH(NOLOCK) where code=#{code,jdbcType=CHAR}")
+            "rtrim(zy_flag) zy_flag,zy_order_code,rtrim(mz_flag) mz_flag,mz_code,bw_code,group_code,exec_address from jc_zd_item WITH(NOLOCK) where code=#{code,jdbcType=CHAR}")
     JcZdItem selectJcZdItemByCode(@Param("code") String code);
 
     /**
@@ -22,7 +22,7 @@ public interface JcZdItemMapper {
      */
     @Select({"<script>",
             "select rtrim(code) code,name,rtrim(class) class_code,py_code,d_code wb_code,rtrim(del_flag) del_flag,rtrim(exec_unit) exec_unit,rtrim(tj_flag) tj_flag," +
-                    "rtrim(zy_flag) zy_flag,zy_order_code,rtrim(mz_flag) mz_flag,mz_code,bw_code,group_code from jc_zd_item WITH(NOLOCK) where (del_flag <![CDATA[<>]]>  '1' or del_flag is null )",
+                    "rtrim(zy_flag) zy_flag,zy_order_code,rtrim(mz_flag) mz_flag,mz_code,bw_code,group_code,exec_address from jc_zd_item WITH(NOLOCK) where (del_flag <![CDATA[<>]]>  '1' or del_flag is null )",
             "<when test='codes!=null'>",
             " and code in",
             "<foreach item='item' index='index' collection='codes' open='(' separator=',' close=')'>",
@@ -41,7 +41,7 @@ public interface JcZdItemMapper {
      */
     @Select({"<script>",
             "SELECT top ${pageSize} rtrim(code) code,name,rtrim(class) class_code,py_code,d_code wb_code,rtrim(del_flag) del_flag,rtrim(exec_unit) exec_unit,rtrim(tj_flag) tj_flag,",
-            "rtrim(zy_flag) zy_flag,zy_order_code,rtrim(mz_flag) mz_flag,mz_code,bw_code,group_code FROM (SELECT ROW_NUMBER() OVER (ORDER BY jc_zd_item_page.code desc) ",
+            "rtrim(zy_flag) zy_flag,zy_order_code,rtrim(mz_flag) mz_flag,mz_code,bw_code,group_code,exec_address FROM (SELECT ROW_NUMBER() OVER (ORDER BY jc_zd_item_page.code desc) ",
             "AS RowNumber,* from dbo.jc_zd_item jc_zd_item_page WITH(NOLOCK) where 1=1 ",
             "<when test='code!=null'>",
             " and (code like #{code} or name like #{code} or py_code like #{code} or d_code like #{code} )",
@@ -110,7 +110,7 @@ public interface JcZdItemMapper {
      */
     @Insert("if not exists (select name  from jc_zd_item WITH(NOLOCK) where code=#{code} or zy_order_code=#{zyOrderCode} or mz_code=#{mzCode}) " +
             "INSERT INTO jc_zd_item(class, code, name, py_code, d_code, del_flag, exec_unit, zy_flag, zy_order_code, mz_flag, mz_code, bw_code, " +
-            "group_code,wx_bookable_flag) VALUES (#{classCode}, #{code}, #{name}, #{pyCode}, #{wbCode}, #{delFlag}, #{execUnit}, #{zyFlag}, #{zyOrderCode}, #{mzFlag}, #{mzCode}, #{bwCode}, #{groupCode}, 0)")
+            "group_code,wx_bookable_flag,exec_address) VALUES (#{classCode}, #{code}, #{name}, #{pyCode}, #{wbCode}, #{delFlag}, #{execUnit}, #{zyFlag}, #{zyOrderCode}, #{mzFlag}, #{mzCode}, #{bwCode}, #{groupCode}, 0,#{execAddress})")
     int insertJcZdItem(JcZdItem jcZdItem);
 
     /**
@@ -185,6 +185,9 @@ public interface JcZdItemMapper {
             "<when test='bwCode!=null'>",
             ",bw_code =#{bwCode}",
             "</when>",
+            "<when test='execAddress!=null'>",
+            ",exec_address =#{execAddress}",
+            "</when>",
             "</trim>",
             "</script>"})
     int updateJcZdItem(JcZdItem jcZdItem);

src/main/java/cn/hnthyy/thmz/mapper/his/zd/JyZdItemMapper.java

@@ -12,7 +12,7 @@ public interface JyZdItemMapper {
      * @return
      */
     @Select("select rtrim(code) code,name,rtrim(class) class_code,rtrim(exec_unit) exec_unit,vessel,dosage,rtrim(sample_code) sample_code,py_code,d_code wb_code," +
-            "rtrim(del_flag) del_flag,rtrim(zy_flag) zy_flag,zy_order_code,rtrim(mz_flag) mz_flag,mz_code,cx_times from jy_zd_item WITH(NOLOCK) where code=#{code,jdbcType=CHAR}")
+            "rtrim(del_flag) del_flag,rtrim(zy_flag) zy_flag,zy_order_code,rtrim(mz_flag) mz_flag,mz_code,cx_times,exec_address from jy_zd_item WITH(NOLOCK) where code=#{code,jdbcType=CHAR}")
     JyZdItem selectJyZdItemByCode(@Param("code") String code);
 
     /**
@@ -22,7 +22,7 @@ public interface JyZdItemMapper {
      */
     @Select({"<script>",
             "select rtrim(code) code,name,rtrim(class) class_code,rtrim(exec_unit) exec_unit,vessel,dosage,rtrim(sample_code) sample_code,py_code,d_code wb_code," +
-                    "rtrim(del_flag) del_flag,rtrim(zy_flag) zy_flag,zy_order_code,rtrim(mz_flag) mz_flag,mz_code,cx_times from jy_zd_item WITH(NOLOCK) where (del_flag <![CDATA[<>]]>  '1' or del_flag is null )",
+                    "rtrim(del_flag) del_flag,rtrim(zy_flag) zy_flag,zy_order_code,rtrim(mz_flag) mz_flag,mz_code,cx_times,exec_address from jy_zd_item WITH(NOLOCK) where (del_flag <![CDATA[<>]]>  '1' or del_flag is null )",
             "<when test='codes!=null'>",
             " and code in",
             "<foreach item='item' index='index' collection='codes' open='(' separator=',' close=')'>",
@@ -43,7 +43,7 @@ public interface JyZdItemMapper {
      */
     @Select({"<script>",
             "select rtrim(code) code,name,rtrim(class) class_code,rtrim(exec_unit) exec_unit,vessel,dosage,rtrim(sample_code) sample_code,py_code,d_code wb_code," +
-                    "rtrim(del_flag) del_flag,rtrim(zy_flag) zy_flag,zy_order_code,rtrim(mz_flag) mz_flag,mz_code,cx_times from jy_zd_item WITH(NOLOCK) " +
+                    "rtrim(del_flag) del_flag,rtrim(zy_flag) zy_flag,zy_order_code,rtrim(mz_flag) mz_flag,mz_code,cx_times,exec_address from jy_zd_item WITH(NOLOCK) " +
                     " where vessel is not null and vessel <![CDATA[<>]]>  '' ",
             "<when test='codes!=null'>",
             " and code in",
@@ -66,7 +66,7 @@ public interface JyZdItemMapper {
      */
     @Select({"<script>",
             "SELECT top ${pageSize} rtrim(code) code,name,rtrim(class) class_code,py_code,d_code wb_code,rtrim(del_flag) del_flag,rtrim(exec_unit) exec_unit,",
-            "rtrim(zy_flag) zy_flag,zy_order_code,rtrim(mz_flag) mz_flag,mz_code,sample_code,rtrim(vessel) vessel FROM (SELECT ROW_NUMBER() OVER (ORDER BY jy_zd_item_page.code desc) ",
+            "rtrim(zy_flag) zy_flag,zy_order_code,rtrim(mz_flag) mz_flag,mz_code,sample_code,rtrim(vessel) vessel,exec_address FROM (SELECT ROW_NUMBER() OVER (ORDER BY jy_zd_item_page.code desc) ",
             "AS RowNumber,* from dbo.jy_zd_item jy_zd_item_page WITH(NOLOCK) where 1=1 ",
             "<when test='code!=null'>",
             " and (code like #{code} or name like #{code} or py_code like #{code} or d_code like #{code} )",
@@ -140,8 +140,8 @@ public interface JyZdItemMapper {
      * @return
      */
     @Insert("if not exists (select name  from jy_zd_item WITH(NOLOCK) where code=#{code} or zy_order_code=#{zyOrderCode} or mz_code=#{mzCode}) " +
-            "INSERT INTO jy_zd_item(code, name, class, exec_unit, vessel, sample_code, py_code, d_code, del_flag, zy_flag, zy_order_code, mz_flag, mz_code) " +
-            "VALUES (#{code}, #{name}, #{classCode}, #{execUnit}, #{vessel}, #{sampleCode}, #{pyCode}, #{wbCode}, #{delFlag}, #{zyFlag}, #{zyOrderCode}, #{mzFlag}, #{mzCode})")
+            "INSERT INTO jy_zd_item(code, name, class, exec_unit, vessel, sample_code, py_code, d_code, del_flag, zy_flag, zy_order_code, mz_flag, mz_code,exec_address) " +
+            "VALUES (#{code}, #{name}, #{classCode}, #{execUnit}, #{vessel}, #{sampleCode}, #{pyCode}, #{wbCode}, #{delFlag}, #{zyFlag}, #{zyOrderCode}, #{mzFlag}, #{mzCode}, #{execAddress})")
     int insertJyZdItem(JyZdItem jyZdItem);
 
     /**
@@ -218,6 +218,9 @@ public interface JyZdItemMapper {
             "<when test='sampleCode!=null'>",
             ",sample_code =#{sampleCode}",
             "</when>",
+            "<when test='execAddress!=null'>",
+            ",exec_address =#{execAddress}",
+            "</when>",
             "</trim>",
             "</script>"})
     int updateJyZdItem(JyZdItem jyZdItem);

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzChargeDetailServiceImpl.java

@@ -2172,6 +2172,9 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                 mzYjReq.setReqDoctor(mzPrescriptionVo.getDoctorCode());
                 mzYjReq.setReceiveFlag(YesNoEnum.NO.code.toString());
                 mzYjReq.setReqComment("主诉:" + mzPrescriptionVo.getMzBlRecord().getEmrChiefComplaint() + " 现病史:" + mzPrescriptionVo.getMzBlRecord().getEmrHpi() + " 既往史:" + mzPrescriptionVo.getMzBlRecord().getEmrPs());
+                if(mzYjReq.getQuantity()==null || mzYjReq.getQuantity()<=0){
+                    mzYjReq.setQuantity(1);
+                }
                 JcZdItem jcZdItem = jcZdItemMapper.selectJcZdItemByCode(mzYjReq.getOrderCode());
                 if (jcZdItem != null) {
                     if (YesNoEnum.YES.code.equals(jcZdItem.getDelFlag()) || YesNoEnum.YES.code.equals(jcZdItem.getMzFlag())) {

src/main/resources/static/js/mz/jc_jy_zd_item.js

@@ -152,7 +152,8 @@ function saveJcZdItem() {
             bwCode: $("#bwCode").val(),
             delFlag: $("#delFlag").val(),
             zyFlag: $("#zyFlag").val(),
-            mzFlag: $("#mzFlag").val()
+            mzFlag: $("#mzFlag").val(),
+            execAddress:$("#execAddress").val()
         });
     } else {
         //新增檢查
@@ -163,7 +164,8 @@ function saveJcZdItem() {
             bwCode: $("#bwCode").val(),
             delFlag: $("#delFlag").val(),
             zyFlag: $("#zyFlag").val(),
-            mzFlag: $("#mzFlag").val()
+            mzFlag: $("#mzFlag").val(),
+            execAddress:$("#execAddress").val()
         });
     }
     $.ajax({
@@ -278,7 +280,8 @@ function saveJyZdItem() {
             vessel: $("#vessel").val(),
             delFlag: $("#delFlagJy").val(),
             zyFlag: $("#zyFlagJy").val(),
-            mzFlag: $("#mzFlagJy").val()
+            mzFlag: $("#mzFlagJy").val(),
+            execAddress:$("#jyExecAddress").val()
         });
     } else {
         //新增檢验
@@ -290,7 +293,8 @@ function saveJyZdItem() {
             vessel: $("#vessel").val(),
             delFlag: $("#delFlagJy").val(),
             zyFlag: $("#zyFlagJy").val(),
-            mzFlag: $("#mzFlagJy").val()
+            mzFlag: $("#mzFlagJy").val(),
+            execAddress:$("#jyExecAddress").val()
         });
     }
     $.ajax({
@@ -337,6 +341,7 @@ function clearJcInput() {
     $("#zyFlag").selectpicker('refresh');
     $("#mzFlag").selectpicker('val', 0);//默认不选中
     $("#mzFlag").selectpicker('refresh');
+    $("#execAddress").val(null);
 }
 
 /**
@@ -389,6 +394,7 @@ function clearJyInput() {
     $("#zyFlagJy").selectpicker('refresh');
     $("#mzFlagJy").selectpicker('val', 0);//默认不选中
     $("#mzFlagJy").selectpicker('refresh');
+    $("#jyExecAddress").val(null);
 }
 
 
@@ -1038,6 +1044,7 @@ function editJcZdItem(code) {
                 $("#zyFlag").selectpicker('refresh');
                 $("#mzFlag").selectpicker('val', res.data.mzFlag);//默认不选中
                 $("#mzFlag").selectpicker('refresh');
+                $("#execAddress").val(res.data.execAddress);
                 $("#editJcModal").modal();
             } else {
                 errorMesage(res);
@@ -1080,6 +1087,7 @@ function editJyZdItem(code) {
                 $("#zyFlagJy").selectpicker('refresh');
                 $("#mzFlagJy").selectpicker('val', res.data.mzFlag);//默认不选中
                 $("#mzFlagJy").selectpicker('refresh');
+                $("#jyExecAddress").val(res.data.execAddress);
                 $("#editJyModal").modal();
             } else {
                 errorMesage(res);

src/main/resources/static/js/mz/toll_administration.js

@@ -1118,17 +1118,6 @@ function checkFee(flag) {
                 }
             }
         }
-        // if (notCashAmount > realMoney) {
-        //     new PNotify({
-        //         title: '错误提示',
-        //         text: "非现金收款金额不能大于实收金额！",
-        //         type: 'error',
-        //         hide: true,
-        //         styling: 'bootstrap3'
-        //     });
-        //     $("#addPayType").parent().removeClass("in").addClass("hide");
-        //     return;
-        // }
         var totalAmount = Add(cashAmount, notCashAmount);
         $("#surplusAmount").val(0.0);
         if (totalAmount < realMoney) {

src/main/resources/templates/mz/jc_jy_zd_item.html

@@ -164,6 +164,14 @@
                                     title="请选择"></select>
                         </div>
                     </div>
+                    <div class="item form-group thmz_alert">
+                        <label class="control-label col-md-2 col-sm-2 col-xs-12" for="execAddress">执行地点
+                        </label>
+                        <div class="col-md-10 col-sm-10 col-xs-12">
+                            <input id="execAddress" class="form-control optional" type="text"
+                                   placeholder="请输入">
+                        </div>
+                    </div>
                 </form>
             </div>
             <div class="modal-footer">
@@ -255,6 +263,14 @@
                                     title="请选择"></select>
                         </div>
                     </div>
+                    <div class="item form-group thmz_alert">
+                        <label class="control-label col-md-2 col-sm-2 col-xs-12" for="jyExecAddress">执行地点
+                        </label>
+                        <div class="col-md-10 col-sm-10 col-xs-12">
+                            <input id="jyExecAddress" class="form-control optional" type="text"
+                                   placeholder="请输入">
+                        </div>
+                    </div>
                 </form>
             </div>
             <div class="modal-footer">