检查检验项目新增报告时限维护

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

@@ -48,4 +48,6 @@ public class JcZdItem extends PageBean implements Serializable {
     private Integer minAgeRestriction;
     //最大年龄限制
     private Integer maxAgeRestriction;
+    //报告时限
+    private String timeLimit;
 }

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

@@ -66,4 +66,6 @@ public class JyZdItem extends PageBean implements Serializable {
     private Integer minAgeRestriction;
     //最大年龄限制包含等于
     private Integer maxAgeRestriction;
+    //报告时限
+    private String timeLimit;
 }

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

@@ -13,7 +13,7 @@ public interface JcZdItemMapper {
      */
     @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,exec_address, " +
-            "gender_restriction, min_age_restriction, max_age_restriction " +
+            "gender_restriction, min_age_restriction, max_age_restriction, time_limit " +
             "from jc_zd_item WITH(NOLOCK) where code=#{code,jdbcType=CHAR}")
     JcZdItem selectJcZdItemByCode(@Param("code") String code);
 
@@ -25,7 +25,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,exec_address, " +
-                    "gender_restriction, min_age_restriction, max_age_restriction" +
+                    "gender_restriction, min_age_restriction, max_age_restriction, time_limit" +
                     " from jc_zd_item WITH(NOLOCK) where (del_flag <![CDATA[<>]]>  '1' or del_flag is null )",
             "<when test='codes!=null'>",
             " and code in",
@@ -46,7 +46,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,exec_address, ",
-            "gender_restriction, min_age_restriction, max_age_restriction ",
+            "gender_restriction, min_age_restriction, max_age_restriction, time_limit ",
             "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'>",
@@ -116,9 +116,9 @@ 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,exec_address, gender_restriction, min_age_restriction, max_age_restriction) " +
+            "group_code,wx_bookable_flag,exec_address, gender_restriction, min_age_restriction, max_age_restriction, time_limit) " +
             "VALUES (#{classCode}, #{code}, #{name}, #{pyCode}, #{wbCode}, #{delFlag}, #{execUnit}, #{zyFlag}, #{zyOrderCode}, #{mzFlag}, " +
-            "#{mzCode}, #{bwCode}, #{groupCode}, 0,#{execAddress}, #{genderRestriction}, #{minAgeRestriction}, #{maxAgeRestriction})")
+            "#{mzCode}, #{bwCode}, #{groupCode}, 0,#{execAddress}, #{genderRestriction}, #{minAgeRestriction}, #{maxAgeRestriction}, #{timeLimit})")
     int insertJcZdItem(JcZdItem jcZdItem);
 
     /**
@@ -196,6 +196,9 @@ public interface JcZdItemMapper {
             "<when test='execAddress!=null'>",
             ",exec_address =#{execAddress}",
             "</when>",
+            "<when test='timeLimit!=null'>",
+            ",time_limit = #{timeLimit}",
+            "</when>",
             ",gender_restriction =#{genderRestriction}",
             ",min_age_restriction =#{minAgeRestriction}",
             ",max_age_restriction =#{maxAgeRestriction}",

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

@@ -14,7 +14,7 @@ public interface JyZdItemMapper {
      */
     @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,exec_address, " +
-            "gender_restriction, min_age_restriction, max_age_restriction " +
+            "gender_restriction, min_age_restriction, max_age_restriction, time_limit " +
             "from jy_zd_item WITH(NOLOCK) where code=#{code,jdbcType=CHAR}")
     JyZdItem selectJyZdItemByCode(@Param("code") String code);
 
@@ -26,7 +26,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,exec_address, " +
-                    "gender_restriction, min_age_restriction, max_age_restriction " +
+                    "gender_restriction, min_age_restriction, max_age_restriction, time_limit " +
                     "from jy_zd_item WITH(NOLOCK) where (del_flag <![CDATA[<>]]>  '1' or del_flag is null )",
             "<when test='codes!=null'>",
             " and code in",
@@ -49,7 +49,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,exec_address, " +
-                    "gender_restriction, min_age_restriction, max_age_restriction " +
+                    "gender_restriction, min_age_restriction, max_age_restriction, time_limit " +
                     "from jy_zd_item WITH(NOLOCK) " +
                     " where vessel is not null and vessel <![CDATA[<>]]>  '' ",
             "<when test='codes!=null'>",
@@ -74,7 +74,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,exec_address, ",
-            "gender_restriction, min_age_restriction, max_age_restriction ",
+            "gender_restriction, min_age_restriction, max_age_restriction, time_limit ",
             "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'>",
@@ -150,9 +150,9 @@ public interface JyZdItemMapper {
      */
     @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,exec_address, gender_restriction, min_age_restriction, max_age_restriction) " +
+            "mz_flag, mz_code,exec_address, gender_restriction, min_age_restriction, max_age_restriction, time_limit) " +
             "VALUES (#{code}, #{name}, #{classCode}, #{execUnit}, #{vessel}, #{sampleCode}, #{pyCode}, #{wbCode}, #{delFlag}, #{zyFlag}, #{zyOrderCode}, " +
-            "#{mzFlag}, #{mzCode}, #{execAddress}, #{genderRestriction}, #{minAgeRestriction}, #{maxAgeRestriction})")
+            "#{mzFlag}, #{mzCode}, #{execAddress}, #{genderRestriction}, #{minAgeRestriction}, #{maxAgeRestriction}, #{timeLimit})")
     int insertJyZdItem(JyZdItem jyZdItem);
 
     /**
@@ -232,6 +232,9 @@ public interface JyZdItemMapper {
             "<when test='execAddress!=null'>",
             ",exec_address =#{execAddress}",
             "</when>",
+            "<when test='timeLimit!=null'>",
+            ",time_limit = #{timeLimit}",
+            "</when>",
             ",gender_restriction =#{genderRestriction}",
             ",min_age_restriction =#{minAgeRestriction}",
             ",max_age_restriction =#{maxAgeRestriction}",

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

@@ -171,7 +171,8 @@ function saveJcZdItem() {
             execAddress:$("#execAddress").val(),
             genderRestriction:$("#genderRestriction").val(),
             minAgeRestriction:$("#minAgeRestriction").val(),
-            maxAgeRestriction:$("#maxAgeRestriction").val()
+            maxAgeRestriction:$("#maxAgeRestriction").val(),
+            timeLimit:$("#timeLimit").val()
         });
     } else {
         //新增檢查
@@ -186,8 +187,8 @@ function saveJcZdItem() {
             execAddress:$("#execAddress").val(),
             genderRestriction:$("#genderRestriction").val(),
             minAgeRestriction:$("#minAgeRestriction").val(),
-            maxAgeRestriction:$("#maxAgeRestriction").val()
-
+            maxAgeRestriction:$("#maxAgeRestriction").val(),
+            timeLimit:$("#timeLimit").val()
         });
     }
     $.ajax({
@@ -321,7 +322,8 @@ function saveJyZdItem() {
             execAddress:$("#jyExecAddress").val(),
             genderRestriction:$("#genderRestrictionJy").val(),
             minAgeRestriction:$("#minAgeRestrictionJy").val(),
-            maxAgeRestriction:$("#maxAgeRestrictionJy").val()
+            maxAgeRestriction:$("#maxAgeRestrictionJy").val(),
+            timeLimit:$("#timeLimitJy").val()
         });
     } else {
         //新增檢验
@@ -337,7 +339,8 @@ function saveJyZdItem() {
             execAddress:$("#jyExecAddress").val(),
             genderRestriction:$("#genderRestrictionJy").val(),
             minAgeRestriction:$("#minAgeRestrictionJy").val(),
-            maxAgeRestriction:$("#maxAgeRestrictionJy").val()
+            maxAgeRestriction:$("#maxAgeRestrictionJy").val(),
+            timeLimit:$("#timeLimitJy").val(),
         });
     }
     $.ajax({
@@ -389,6 +392,7 @@ function clearJcInput() {
     $("#genderRestriction").selectpicker('refresh');
     $("#minAgeRestriction").val(null);
     $("#maxAgeRestriction").val(null);
+    $("#timeLimit").val(null);
 }
 
 /**
@@ -446,6 +450,7 @@ function clearJyInput() {
     $("#genderRestrictionJy").selectpicker('refresh');
     $("#minAgeRestrictionJy").val(null);
     $("#maxAgeRestrictionJy").val(null);
+    $("#timeLimitJy").val(null);
 }
 
 
@@ -1100,6 +1105,7 @@ function editJcZdItem(code) {
                 $("#genderRestriction").selectpicker('refresh');
                 $("#minAgeRestriction").val(res.data.minAgeRestriction);
                 $("#maxAgeRestriction").val(res.data.maxAgeRestriction);
+                $("#timeLimit").val(res.data.timeLimit);
                 $("#editJcModal").modal();
             } else {
                 errorMesage(res);
@@ -1147,6 +1153,7 @@ function editJyZdItem(code) {
                 $("#genderRestrictionJy").selectpicker('refresh');
                 $("#minAgeRestrictionJy").val(res.data.minAgeRestriction);
                 $("#maxAgeRestrictionJy").val(res.data.maxAgeRestriction);
+                $("#timeLimitJy").val(res.data.timeLimit);
                 $("#editJyModal").modal();
             } else {
                 errorMesage(res);

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

@@ -196,6 +196,14 @@
                                    placeholder="请输入">
                         </div>
                     </div>
+                    <div class="item form-group thmz_alert">
+                        <label class="control-label col-md-2 col-sm-2 col-xs-12" for="timeLimit">报告时限
+                        </label>
+                        <div class="col-md-10 col-sm-10 col-xs-12">
+                            <input id="timeLimit" class="form-control optional" type="text"
+                                   placeholder="请输入报告时限说明">
+                        </div>
+                    </div>
                 </form>
             </div>
             <div class="modal-footer">
@@ -319,6 +327,14 @@
                                    placeholder="请输入">
                         </div>
                     </div>
+                    <div class="item form-group thmz_alert">
+                        <label class="control-label col-md-2 col-sm-2 col-xs-12" for="timeLimitJy">报告时限
+                        </label>
+                        <div class="col-md-10 col-sm-10 col-xs-12">
+                            <input id="timeLimitJy" class="form-control optional" type="text"
+                                   placeholder="请输入">
+                        </div>
+                    </div>
                 </form>
             </div>
             <div class="modal-footer">