jiangjiazhi / regional-platform

Download as
Browse Code »

Commit bd3af687f4043d7ef0b14f7f9bd15ee193187a0e

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

update

Showing 5 changed files with 28 additions and 28 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/FolviteQuery.java View file @ bd3af68
... ... @@ -26,7 +26,7 @@
26 26 private String certificateType;
27 27  
28 28 //是否结束孕辰 0、未结束 1、已结束
29   - private int ispregnancy;
  29 + private Integer ispregnancy;
30 30  
31 31 //建档医院
32 32 private String hospitalId;
33 33  
... ... @@ -115,11 +115,11 @@
115 115 return certificateType;
116 116 }
117 117  
118   - public int getIspregnancy() {
  118 + public Integer getIspregnancy() {
119 119 return ispregnancy;
120 120 }
121 121  
122   - public void setIspregnancy(int ispregnancy) {
  122 + public void setIspregnancy(Integer ispregnancy) {
123 123 this.ispregnancy = ispregnancy;
124 124 }
125 125  
platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml View file @ bd3af68
... ... @@ -294,11 +294,12 @@
294 294 and vc_card=#{vcCard,jdbcType=VARCHAR}
295 295 </if>
296 296 <if test="hospitalId != null and hospitalId !=''">
297   - and hospitalId=#{hospitalId,jdbcType=VARCHAR}
  297 + and hospitalid=#{hospitalId,jdbcType=VARCHAR}
298 298 </if>
299   - <if test="ispregnancy != null and ispregnancy !=''">
300   - and ispregnancy=#{ispregnancy,jdbcType=VARCHAR}
  299 + <if test="ispregnancy != null">
  300 + and ispregnancy=#{ispregnancy}
301 301 </if>
  302 +
302 303 </where>
303 304 </sql>
304 305  
platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml View file @ bd3af68
... ... @@ -59,7 +59,7 @@
59 59  
60 60 <select id="list" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery" resultType="map">
61 61 SELECT
62   - f.`name` as name,f.birthday,f.card_no,f.vc_card,p.isconceive,f.receivesum,
  62 + f.`name` as name,f.birthday,f.card_no,f.vc_card,f.isconceive,f.receivesum,
63 63 SUM(p.receive_number) as sumNumber,f.drawTime,f.domicile_address,f.domicile_area,
64 64 f.domicile_city,f.domicile_country,f.domicile_province,p.folvite_id,p.issuer,f.phone
65 65 FROM
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java View file @ bd3af68
... ... @@ -19,7 +19,6 @@
19 19  
20 20 import javax.servlet.http.HttpServletRequest;
21 21 import javax.validation.Valid;
22   -import java.util.Date;
23 22 import java.util.List;
24 23 import java.util.Map;
25 24  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java View file @ bd3af68
... ... @@ -79,7 +79,7 @@
79 79 folviteQuery.setHospitalId(hospitalId);
80 80 List<FolviteRecordModel> recordModels = folviteMapper.queryList(folviteQuery);
81 81 Map<String, Object> data = new HashMap<>();
82   - String folviteId = null;
  82 + List<Map<String, Object>> listMap = new ArrayList<>();
83 83 if (CollectionUtils.isNotEmpty(recordModels)) {
84 84 FolviteRecordModel queryOne = recordModels.get(0);
85 85 if (null != queryOne) {
86 86  
87 87  
88 88  
... ... @@ -92,27 +92,26 @@
92 92 data.put("sumNumber", queryOne.getReceiveSum());
93 93 data.put("address", CommonsHelper.getResidence(queryOne.getDomicileProvince(), queryOne.getDomicileCity(),
94 94 queryOne.getDomicileArea(), queryOne.getDomicileCountry(), queryOne.getDomicileAddress(), basicConfigService));
  95 + data.put("drawTime", DateUtil.getyyyy_MM_dd(queryOne.getDrawTime()));
95 96 flag = false;
96   - folviteId = queryOne.getId();
97 97 }
98   - }
99   - FolviteRecordQuery recordQuery = new FolviteRecordQuery();
100   - recordQuery.setFolviteId(folviteId);
101   - List<Map<String, Object>> listMap = new ArrayList<>();
102   - List<FolviteReceiveRecordModel> folviteRecordModels = queryFolviteReceiveList(recordQuery);
103   - if (CollectionUtils.isNotEmpty(folviteRecordModels)) {
104   - for (FolviteReceiveRecordModel folviteRecordModel : folviteRecordModels) {
105   - Map<String, Object> recordMap = new HashMap<>();
106   - recordMap.put("drawCount", folviteRecordModel.getReceiveNumber());
107   - recordMap.put("drawTime", DateUtil.getyyyy_MM_dd(folviteRecordModel.getReceiveDate()));
108   - recordMap.put("id", folviteRecordModel.getId());
109   - recordMap.put("other", folviteRecordModel.getIsconceive());
110   - if (folviteRecordModel.getIsconceive() == 0) {
111   - recordMap.put("pregnancyType", "孕前");
112   - } else {
113   - recordMap.put("pregnancyType", "孕" + folviteRecordModel.getReceiveWeek() + "周");
  98 + FolviteRecordQuery recordQuery = new FolviteRecordQuery();
  99 + recordQuery.setFolviteId(queryOne.getId());
  100 + List<FolviteReceiveRecordModel> folviteRecordModels = queryFolviteReceiveList(recordQuery);
  101 + if (CollectionUtils.isNotEmpty(folviteRecordModels)) {
  102 + for (FolviteReceiveRecordModel folviteRecordModel : folviteRecordModels) {
  103 + Map<String, Object> recordMap = new HashMap<>();
  104 + recordMap.put("drawCount", folviteRecordModel.getReceiveNumber());
  105 + recordMap.put("drawTime", DateUtil.getyyyy_MM_dd(folviteRecordModel.getReceiveDate()));
  106 + recordMap.put("id", folviteRecordModel.getId());
  107 + recordMap.put("other", folviteRecordModel.getIsconceive());
  108 + if (folviteRecordModel.getIsconceive() == 0) {
  109 + recordMap.put("pregnancyType", "孕前");
  110 + } else {
  111 + recordMap.put("pregnancyType", "孕" + folviteRecordModel.getReceiveWeek() + "周");
  112 + }
  113 + listMap.add(recordMap);
114 114 }
115   - listMap.add(recordMap);
116 115 }
117 116 }
118 117 FolviteResult result = null;
... ... @@ -264,7 +263,7 @@
264 263 m.put("cardNo", map.get("card_no"));
265 264 m.put("vcCard", map.get("vc_card"));
266 265 m.put("birthday", DateUtil.getyyyy_MM_dd((Date) map.get("birthday")));
267   - m.put("isconceive", (int) map.get("isconceive") != 0 ? "孕后" : "孕前");
  266 + m.put("isconceive", map.get("isconceive").toString().equals("0") ? "孕前" : "孕后");
268 267 m.put("receivesum", map.get("receivesum"));
269 268 m.put("drawTime", DateUtil.getyyyy_MM_dd((Date) map.get("drawTime")));
270 269 m.put("sumNumber", map.get("sumNumber"));
... ... @@ -277,6 +276,7 @@
277 276 map.get("domicile_area").toString(), map.get("domicile_country").toString(), map.get("domicile_address").toString(), basicConfigService));
278 277 m.put("issuer", map.get("issuer"));
279 278 m.put("issuerName", usersService.getUsers(Integer.valueOf(map.get("issuer").toString())).getName());
  279 + m.put("phone", map.get("phone"));
280 280 datas.add(m);
281 281 }
282 282 return datas;