jiangjiazhi / regional-platform

Download as
Browse Code »

Commit fb5fd154b2caaf84b1a1cf94c292952e85e8837f

Authored by liquanyu
1 parent c4121767c8
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 4 changed files with 18 additions and 1 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/FolviteRecordQuery.java View file @ fb5fd15
... ... @@ -34,6 +34,16 @@
34 34  
35 35 private Integer yn;
36 36  
  37 + private String hospitalId;
  38 +
  39 + public String getHospitalId() {
  40 + return hospitalId;
  41 + }
  42 +
  43 + public void setHospitalId(String hospitalId) {
  44 + this.hospitalId = hospitalId;
  45 + }
  46 +
37 47 public Integer getYn() {
38 48 return yn;
39 49 }
platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml View file @ fb5fd15
... ... @@ -79,6 +79,9 @@
79 79 <if test="isconceive != null">
80 80 and f.isconceive=#{isconceive}
81 81 </if>
  82 + <if test="hospitalId != null">
  83 + and f.hospitalId=#{hospitalId}
  84 + </if>
82 85  
83 86 <if test="startReceiveDate != null ">
84 87 AND <![CDATA[ p.receive_date >= date_format(#{startReceiveDate},'%Y-%m-%d %H:%i:%S') ]]>
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java View file @ fb5fd15
... ... @@ -128,11 +128,15 @@
128 128 @Param("isconceive") Integer isconceive,
129 129 @Param("receiveTime") String receiveTime,
130 130 @Param("drawTime") String drawTime,
  131 + @Param("hospitalId") String hospitalId,
131 132 @Param("page") Integer page,
132 133 @Param("limit") Integer limit) {
133 134  
134 135 FolviteRecordQuery query = new FolviteRecordQuery();
135 136 query.setYn(YnEnums.YES.getId());
  137 + if (StringUtils.isNotEmpty(hospitalId)) {
  138 + query.setHospitalId(hospitalId);
  139 + }
136 140 if (null != isconceive) {
137 141 query.setIsconceive(isconceive);
138 142 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ fb5fd15
... ... @@ -2616,7 +2616,7 @@
2616 2616  
2617 2617 String handDueWeek = "";
2618 2618 Map<String, Object> handDueWeekMap = maternalDeliverModel.getHandDueWeek();
2619   - if (handDueWeekMap != null && handDueWeekMap.size() > 0)
  2619 + if (handDueWeekMap != null && handDueWeekMap.size() > 0 && handDueWeekMap.get("week") != null && com.lyms.platform.common.utils.StringUtils.isNotEmpty(String.valueOf(handDueWeekMap.get("week"))))
2620 2620 {
2621 2621 handDueWeek = String.valueOf(handDueWeekMap.get("week"))+"孕周"+((handDueWeekMap.get("day") == null || String.valueOf(handDueWeekMap.get("day")).equals("0")) ? "" : String.valueOf(handDueWeekMap.get("day"))+"天" );
2622 2622 }