From 00062fa34c1d2be6bd0c2d7cef394a01811d9282 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 19 Apr 2017 19:12:25 +0800 Subject: [PATCH] update --- .../permission/service/impl/LisServiceImpl.java | 2 +- .../operate/web/controller/LisController.java | 41 +++- .../operate/web/request/LisReportModelRequest.java | 213 +++++++++++++++++++++ 3 files changed, 253 insertions(+), 3 deletions(-) create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/LisReportModelRequest.java diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java index 7fd762d..07e4e79 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java @@ -26,7 +26,7 @@ public class LisServiceImpl extends DataAccessLayerService implements LisService public BaseResponse saveLisData(final List lisList) { try { - //final List lisList =JsonUtil.jkstr2List(lisData, new TypeReference>() {}); +// final List lisList =JsonUtil.jkstr2List(lisData, new TypeReference>() {}); System.out.println("saveLis data size = "+ lisList.size()); if (CollectionUtils.isNotEmpty(lisList)) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java index f563e4d..ff1792e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java @@ -4,7 +4,9 @@ import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.facade.LisFacade; +import com.lyms.platform.operate.web.request.LisReportModelRequest; import com.lyms.platform.permission.model.LisReportModel; import com.lyms.platform.permission.service.LisService; import org.springframework.beans.factory.annotation.Autowired; @@ -12,6 +14,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; import java.util.List; /** @@ -35,9 +38,43 @@ public class LisController extends BaseController { */ @RequestMapping(method = RequestMethod.POST, value = "/saveLisData") @ResponseBody - public BaseResponse saveLisData(@RequestBody List models, + public BaseResponse saveLisData(@RequestBody List models, HttpServletRequest httpServletRequest) { - return lisService.saveLisData(models); + + + List list = new ArrayList<>(); + if (models != null && models.size() > 0) + { + for(LisReportModelRequest lisRequest : models) + { + LisReportModel model = new LisReportModel(); + model.setItems(lisRequest.getItems()); + model.setId(lisRequest.getId()); + model.setVcCardNo(lisRequest.getVcCardNo()); + model.setHospitalId(lisRequest.getHospitalId()); + model.setLisId(lisRequest.getLisId()); + model.setAge(lisRequest.getAge()); + model.setName(lisRequest.getName()); + model.setBhnum(lisRequest.getBhnum()); + model.setPhone(lisRequest.getPhone()); + model.setSex(lisRequest.getSex()); + model.setTitle(lisRequest.getTitle()); + model.setType(lisRequest.getType()); + model.setChecker(lisRequest.getChecker()); + model.setApplyDept(lisRequest.getApplyDept()); + model.setApplyDoctor(lisRequest.getApplyDoctor()); + model.setApplyTime(DateUtil.parseYMDHMS(lisRequest.getApplyTime())); + model.setPublishTime(DateUtil.parseYMDHMS(lisRequest.getPublishTime())); + model.setModified(DateUtil.parseYMDHMS(lisRequest.getModified())); + model.setCreated(DateUtil.parseYMDHMS(lisRequest.getCreated())); + model.setCheckTime(DateUtil.parseYMDHMS(lisRequest.getCheckTime())); + + list.add(model); + + } + } + + return lisService.saveLisData(list); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/LisReportModelRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/LisReportModelRequest.java new file mode 100644 index 0000000..0288cf3 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/LisReportModelRequest.java @@ -0,0 +1,213 @@ +package com.lyms.platform.operate.web.request; + +import com.lyms.platform.permission.model.LisReportItemModel; + +import java.util.List; + +/** + * Created by Administrator on 2017-04-19. + */ +public class LisReportModelRequest { + + private Integer id; + // 检验报告ID + private String lisId; + // 检验报告名称 + private String title; + // 检验报告类型 + private String type; + // 就诊卡号 + private String vcCardNo; + // 患者姓名 + private String name; + // 住院号 + private String bhnum; + // 患者年龄 + private String age; + // 患者性别 + private String sex; + // 送检日期 + private String applyTime; + // 检验时间 + private String checkTime; + // 报告发布时间 + private String publishTime; + // 送检医生 + private String applyDoctor; + // 送检科室 + private String applyDept; + // 检验员 + private String checker; + // 最后修改时间 + private String modified; + // 创建时间 + private String created; + // 医院id + private String hospitalId; + + //联系方式 + private String phone; + + //检验项集合 + private List items; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getLisId() { + return lisId; + } + + public void setLisId(String lisId) { + this.lisId = lisId; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getVcCardNo() { + return vcCardNo; + } + + public void setVcCardNo(String vcCardNo) { + this.vcCardNo = vcCardNo; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getBhnum() { + return bhnum; + } + + public void setBhnum(String bhnum) { + this.bhnum = bhnum; + } + + public String getAge() { + return age; + } + + public void setAge(String age) { + this.age = age; + } + + public String getSex() { + return sex; + } + + public void setSex(String sex) { + this.sex = sex; + } + + public String getApplyTime() { + return applyTime; + } + + public void setApplyTime(String applyTime) { + this.applyTime = applyTime; + } + + public String getCheckTime() { + return checkTime; + } + + public void setCheckTime(String checkTime) { + this.checkTime = checkTime; + } + + public String getPublishTime() { + return publishTime; + } + + public void setPublishTime(String publishTime) { + this.publishTime = publishTime; + } + + public String getApplyDoctor() { + return applyDoctor; + } + + public void setApplyDoctor(String applyDoctor) { + this.applyDoctor = applyDoctor; + } + + public String getApplyDept() { + return applyDept; + } + + public void setApplyDept(String applyDept) { + this.applyDept = applyDept; + } + + public String getChecker() { + return checker; + } + + public void setChecker(String checker) { + this.checker = checker; + } + + public String getModified() { + return modified; + } + + public void setModified(String modified) { + this.modified = modified; + } + + public String getCreated() { + return created; + } + + public void setCreated(String created) { + this.created = created; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getItems() { + return items; + } + + public void setItems(List items) { + this.items = items; + } +} -- 1.8.3.1