From ca1a4e9193adcb573d98b93ce139e397ab8b5748 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 19 Mar 2020 09:24:40 +0800 Subject: [PATCH] update --- .../java/com/lyms/hospitalapi/lcfy/LisService.java | 13 +++++++++---- .../web/controller/DefectiveChildController.java | 9 +++------ .../web/controller/PreEugenicsBaseController.java | 15 +++++++++++++++ .../operate/web/service/DefectiveChildService.java | 1 - .../operate/web/service/IPreEugenicsService.java | 2 ++ .../web/service/impl/DefectiveChildServiceImpl.java | 8 ++++++++ .../web/service/impl/PreEugebicsServiceImpl.java | 18 ++++++++++++------ 7 files changed, 49 insertions(+), 17 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcfy/LisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcfy/LisService.java index 0ce3bf9..5b529f2 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcfy/LisService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcfy/LisService.java @@ -1,6 +1,7 @@ package com.lyms.hospitalapi.lcfy; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.PingYinUtil; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.pojo.PreEugenicsBaseModel; import com.lyms.platform.pojo.ResidentsArchiveModel; @@ -58,7 +59,7 @@ public class LisService { itemsMan.put("lyms013","梅毒螺旋体筛查"); Connection conn = null; String sql = "insert into TI_申请信息(v患者类别,v患者编号,v患者ID号,v患者姓名,v性别,v年龄,v年龄类型,v申请项目编码,v申请项目名称," + - "v唯一标识号,iTag,v手机号,v身份证号,d申请时间,v申请日期,i项目数量) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + "v唯一标识号,iTag,v手机号,v身份证号,d申请时间,v申请日期,i项目数量,v拼音码) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; PreparedStatement ps = null; ResultSet rs = null; try { @@ -82,8 +83,9 @@ public class LisService { ps.setString(12,model.getWifePhone()); ps.setString(13,model.getWifeCardNo()); ps.setDate(14, new java.sql.Date(new Date().getTime())); - ps.setString(15,DateUtil.getyyyy_MM_dd(new Date())); + ps.setString(15, DateUtil.getyyyy_MM_dd(new Date())); ps.setInt(16, 1); + ps.setString(17, PingYinUtil.getFirstSpell(model.getWifeName()).toUpperCase()); int inCount = ps.executeUpdate(); System.out.println("女性保存"+inCount); } @@ -107,6 +109,7 @@ public class LisService { ps.setDate(14, new java.sql.Date(new Date().getTime())); ps.setString(15, DateUtil.getyyyy_MM_dd(new Date())); ps.setInt(16, 1); + ps.setString(17, PingYinUtil.getFirstSpell(model.getHusbandName()).toUpperCase()); int inCount = ps.executeUpdate(); System.out.println("男性性保存"+inCount); } @@ -177,7 +180,7 @@ public class LisService { itemsMan.put("lymsh013","梅毒螺旋体筛查"); Connection conn = null; String sql = "insert into TI_申请信息(v患者类别,v患者编号,v患者ID号,v患者姓名,v性别,v年龄,v年龄类型,v申请项目编码,v申请项目名称," + - "v唯一标识号,iTag,v手机号,v身份证号,d申请时间,v申请日期,i项目数量) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + "v唯一标识号,iTag,v手机号,v身份证号,d申请时间,v申请日期,i项目数量,v拼音码) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; PreparedStatement ps = null; ResultSet rs = null; try { @@ -211,8 +214,9 @@ public class LisService { ps.setString(12,residentsArchiveModel.getPhone()); ps.setString(13,residentsArchiveModel.getCertificateNum()); ps.setDate(14, new java.sql.Date(new Date().getTime())); - ps.setString(15,DateUtil.getyyyy_MM_dd(new Date())); + ps.setString(15, DateUtil.getyyyy_MM_dd(new Date())); ps.setInt(16, 1); + ps.setString(17, PingYinUtil.getFirstSpell(residentsArchiveModel.getUsername()).toUpperCase()); int inCount = ps.executeUpdate(); System.out.println("女性保存"+inCount); } @@ -239,6 +243,7 @@ public class LisService { ps.setDate(14, new java.sql.Date(new Date().getTime())); ps.setString(15, DateUtil.getyyyy_MM_dd(new Date())); ps.setInt(16, 1); + ps.setString(17, PingYinUtil.getFirstSpell(residentsArchiveModel.getUsername()).toUpperCase()); int inCount = ps.executeUpdate(); System.out.println("男性性保存"+inCount); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DefectiveChildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DefectiveChildController.java index 10fbccf..1d5e447 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DefectiveChildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DefectiveChildController.java @@ -4,10 +4,7 @@ import javax.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import com.fasterxml.jackson.annotation.JsonAlias; import com.lyms.platform.common.annotation.TokenRequired; @@ -57,7 +54,7 @@ public class DefectiveChildController extends BaseController { @TokenRequired public BaseResponse add(@RequestBody DefectiveChildRequest param, HttpServletRequest request) { param.setCreateUser(getUserId(request).toString()); - return defectiveChildService.add(param,getUserId(request)); + return defectiveChildService.add(param, getUserId(request)); } /** @@ -83,7 +80,7 @@ public class DefectiveChildController extends BaseController { @ResponseBody @TokenRequired public BaseListResponse listPage(@JsonAlias DefectiveChildListRequest param,HttpServletRequest request) { - return defectiveChildService.listPage(param,getUserId(request)); + return defectiveChildService.listPage(param, getUserId(request)); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java index c9096f1..ef02ea7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java @@ -147,4 +147,19 @@ public class PreEugenicsBaseController extends BaseController { public BaseResponse delete(@PathVariable String id) { return iPreEugenicsService.delete(id); } + + + + + /** + * 保存lis检查项到lis系统中 + * @param id + * @return + */ + @RequestMapping(value = "/setDefectiveChildCheckItem/{id}", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseResponse setDefectiveChildCheckItem(@PathVariable("id")String id){ + return iPreEugenicsService.setPreEugenicsCheckItem(id); + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/DefectiveChildService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/DefectiveChildService.java index d55d7b2..6d597ae 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/DefectiveChildService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/DefectiveChildService.java @@ -4,5 +4,4 @@ import com.lyms.platform.operate.web.request.DefectiveChildListRequest; import com.lyms.platform.operate.web.request.DefectiveChildRequest; public interface DefectiveChildService extends IFormReportService { - } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java index 6717628..c8edc36 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java @@ -11,4 +11,6 @@ public interface IPreEugenicsService extends IFormReportService