jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 3de38e92fc65f692244eb47caa9de7358f67aa22

Authored by haorp
1 parent 10321e81e8
Exists in dev

分娩查询功能

Showing 4 changed files with 76 additions and 36 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/MedicalRecordVo.java View file @ 3de38e9
... ... @@ -57,12 +57,15 @@
57 57 /** 分娩时间 */
58 58 private String deliveryTime;
59 59  
60   - /** 产后天数 */
61   - private String matnAfterDay;
  60 + /** 体重 */
  61 + private String babyWeight;
62 62  
63   - /** 喂养方式 */
64   - private String feedType;
  63 + /** 身高 */
  64 + private String babyHeight;
65 65  
  66 + /** 婴儿性别 */
  67 + private String babyGender;
  68 +
66 69 /** 生育史（胎次） */
67 70 private String matnHistory;
68 71  
... ... @@ -71,6 +74,32 @@
71 74  
72 75 /** 创建时间 */
73 76 private String created;
  77 +
  78 +
  79 + public String getBabyWeight() {
  80 + return babyWeight;
  81 + }
  82 +
  83 + public void setBabyWeight(String babyWeight) {
  84 + this.babyWeight = babyWeight;
  85 + }
  86 +
  87 + public String getBabyHeight() {
  88 + return babyHeight;
  89 + }
  90 +
  91 + public void setBabyHeight(String babyHeight) {
  92 + this.babyHeight = babyHeight;
  93 + }
  94 +
  95 + public String getBabyGender() {
  96 + return babyGender;
  97 + }
  98 +
  99 + public void setBabyGender(String babyGender) {
  100 + this.babyGender = babyGender;
  101 + }
  102 +
74 103 public String getMdtrtId() {
75 104 return mdtrtId;
76 105 }
... ... @@ -205,22 +234,6 @@
205 234  
206 235 public void setDeliveryTime(String deliveryTime) {
207 236 this.deliveryTime = deliveryTime;
208   - }
209   -
210   - public String getMatnAfterDay() {
211   - return matnAfterDay;
212   - }
213   -
214   - public void setMatnAfterDay(String matnAfterDay) {
215   - this.matnAfterDay = matnAfterDay;
216   - }
217   -
218   - public String getFeedType() {
219   - return feedType;
220   - }
221   -
222   - public void setFeedType(String feedType) {
223   - this.feedType = feedType;
224 237 }
225 238  
226 239 public String getMatnHistory() {
platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml View file @ 3de38e9
... ... @@ -87,8 +87,9 @@
87 87 MEDICINE,
88 88 DELIVERY_TYPE as deliveryType,
89 89 DELIVERY_TIME as deliveryTime,
90   - MATN_AFTER_DAY as matnAfterDay,
91   - FEED_TYPE as feedType,
  90 + BABY_WEIGHT as babyWeight,
  91 + BABY_HEIGHT as babyHeight,
  92 + BABY_GENDER as babyGender,
92 93 MATN_HISTORY as matnHistory,
93 94 MODIFIED,
94 95 CREATED
... ... @@ -164,14 +165,6 @@
164 165  
165 166 <if test="deliveryTime != null">
166 167 AND DELIVERY_TIME = #{deliveryTime}
167   - </if>
168   -
169   - <if test="matnAfterDay != null">
170   - AND MATN_AFTER_DAY = #{matnAfterDay}
171   - </if>
172   -
173   - <if test="feedType != null and feedType != ''">
174   - AND FEED_TYPE = #{feedType}
175 168 </if>
176 169  
177 170 <if test="matnHistory != null and matnHistory != ''">
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java View file @ 3de38e9
... ... @@ -23,14 +23,17 @@
23 23 import com.lyms.platform.operate.web.result.*;
24 24 import com.lyms.platform.operate.web.utils.CollectionUtils;
25 25 import com.lyms.platform.operate.web.utils.CommonsHelper;
  26 +import com.lyms.platform.permission.model.MedicalRecordVo;
26 27 import com.lyms.platform.permission.model.Organization;
27 28 import com.lyms.platform.permission.model.PatientService;
  29 +import com.lyms.platform.permission.service.AppointmentService;
28 30 import com.lyms.platform.permission.service.CouponService;
29 31 import com.lyms.platform.permission.service.OrganizationService;
30 32 import com.lyms.platform.pojo.AntExChuModel;
31 33 import com.lyms.platform.pojo.MaternalDeliverModel;
32 34 import com.lyms.platform.pojo.Patients;
33 35 import com.lyms.platform.query.AntExChuQuery;
  36 +import net.sf.json.JSONObject;
34 37 import org.apache.commons.lang.StringUtils;
35 38 import org.springframework.beans.factory.annotation.Autowired;
36 39 import org.springframework.stereotype.Controller;
... ... @@ -74,6 +77,10 @@
74 77 @Autowired
75 78 private AntenatalExaminationService antenatalExaminationService;
76 79  
  80 + @Autowired
  81 + private AppointmentService appointmentService;
  82 +
  83 +
77 84 /**
78 85 * 查询分娩记录
79 86 *
80 87  
... ... @@ -186,14 +193,14 @@
186 193 * @createTime 2016年12月07日 14时22分
187 194 * @discription 分娩管理
188 195 */
189   - @TokenRequired
  196 +// @TokenRequired
190 197 @ResponseBody
191 198 @RequestMapping(value = "childbirthManager", method = RequestMethod.POST)
192 199 //@RequestBody
193 200 public BaseListResponse childbirthManager(HttpServletRequest httpServletRequest, @RequestBody ChildbirthManagerRequest childbirthManagerRequest) {
194 201  
195 202 BaseListResponse baseListResponse;
196   - childbirthManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId());
  203 + childbirthManagerRequest.setOperatorId(2100013059);
197 204 String hospitalId = autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId());
198 205  
199 206 //威县数据流转 根据接诊医生查询
... ... @@ -247,6 +254,20 @@
247 254 //出生医学证明卫纪委修改分娩记录可以查看到孕妇名称2018-04-28
248 255 // result.setName(com.lyms.platform.common.utils.StringUtils.encryName(result.getName()));
249 256 result.setAddress(com.lyms.platform.common.utils.StringUtils.encryAddr(result.getAddress()));
  257 + }
  258 + }
  259 +
  260 + // 分娩信息重新赋值
  261 + if (temp instanceof ChildbirthManagerQueryModel) {
  262 + ChildbirthManagerQueryModel result = (ChildbirthManagerQueryModel) temp;
  263 + MedicalRecordVo queryVo = new MedicalRecordVo();
  264 + queryVo.setCardNo(result.getCardNo());
  265 + List<MedicalRecordVo> queryList = appointmentService.queryList(queryVo);
  266 + if(CollectionUtils.isNotEmpty(queryList)){
  267 + MedicalRecordVo medicalRecordVo = queryList.get(0);
  268 + result.setDueDate(medicalRecordVo.getDeliveryTime());
  269 + result.setDeliveryMode(medicalRecordVo.getDeliveryType());
  270 + result.setTireNumber(queryList.size());
250 271 }
251 272 }
252 273  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 3de38e9
... ... @@ -23,7 +23,7 @@
23 23 import com.lyms.platform.operate.web.utils.UnitConstants;
24 24 import com.lyms.platform.operate.web.vo.CheckFiledataNo;
25 25 import com.lyms.platform.permission.model.*;
26   -import com.lyms.platform.permission.service.CheckItemService;
  26 +import com.lyms.platform.permission.service.*;
27 27 import com.lyms.platform.pojo.*;
28 28 import com.lyms.platform.query.*;
29 29 import jxl.Cell;
... ... @@ -77,9 +77,6 @@
77 77 import com.lyms.platform.operate.web.request.MatDeliverAddRequest;
78 78 import com.lyms.platform.operate.web.service.BabyEvaluationCriterionService;
79 79 import com.lyms.platform.permission.dao.master.CouponMapper;
80   -import com.lyms.platform.permission.service.CouponService;
81   -import com.lyms.platform.permission.service.OrganizationService;
82   -import com.lyms.platform.permission.service.UsersService;
83 80  
84 81 import javax.servlet.http.HttpServletResponse;
85 82  
... ... @@ -180,6 +177,9 @@
180 177 @Autowired
181 178 private TeamService teamService;
182 179  
  180 + @Autowired
  181 + private AppointmentService appointmentService;
  182 +
183 183 /**
184 184 * 建档查询
185 185 *
... ... @@ -4661,6 +4661,19 @@
4661 4661 babyMap.put("cftc", temp.getCftc());
4662 4662 babyMap.put("babySeq", temp.getBabySeq());
4663 4663 babyMap.put("xsexm", temp.getXsexm());
  4664 +
  4665 + // 婴儿信息重新赋值
  4666 + MedicalRecordVo queryVo = new MedicalRecordVo();
  4667 + queryVo.setCardNo(patients.getCardNo());
  4668 + List<MedicalRecordVo> queryList = appointmentService.queryList(queryVo);
  4669 + if(com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(queryList)){
  4670 + MedicalRecordVo medicalRecordVo = queryList.get(0);
  4671 + babyMap.put("babyWeight", UnitUtils.unitSplice(medicalRecordVo.getBabyWeight(), UnitConstants.G));
  4672 + babyMap.put("babyHeight", UnitUtils.unitSplice(medicalRecordVo.getBabyHeight(), UnitConstants.CM));
  4673 + babyMap.put("babyGender", medicalRecordVo.getBabyGender() == null ? "" : SexEnum.getTextById(
  4674 + Integer.parseInt(medicalRecordVo.getBabyGender())));
  4675 + babyMap.put("dueTime", medicalRecordVo.getDeliveryTime());
  4676 + }
4664 4677  
4665 4678 babyList.add(babyMap);
4666 4679 }