From a526a0a5d88c330de2b58d2fded66fd9c3c4416e Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Wed, 12 Dec 2018 13:02:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A8=81=E6=B5=B7=E5=88=86=E5=A8=A9=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=96=B0=E7=AD=9B=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/biz/service/BabySieveService.java | 8 +++ .../lyms/platform/pojo/MaternalDeliverModel.java | 36 ++++++++++ .../com/lyms/platform/query/BabySieveQuery.java | 4 +- .../com/lyms/hospitalapi/Cdfy/CdGwInterface.java | 18 ++--- .../web/controller/BabySieveController.java | 16 +++++ .../operate/web/facade/BabySieveFacede.java | 79 ++++++++++++++++------ .../platform/operate/web/facade/ViewFacade.java | 5 +- .../operate/web/request/MatDeliverAddRequest.java | 40 +++++++++++ .../operate/web/result/MaternalDeliverResult.java | 40 +++++++++++ 9 files changed, 213 insertions(+), 33 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabySieveService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabySieveService.java index 0e2fe36..b162c48 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabySieveService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabySieveService.java @@ -35,6 +35,14 @@ public class BabySieveService { return babySieveDao.queryBabySieve(query.addOrder(Sort.Direction.DESC, "created")); } + public List getBabySieveQuery1(BabySieveQuery babySieveQuery){ + MongoQuery query = babySieveQuery.convertToQuery(); + //babySieveQuery.mysqlBuild(babySieveDao.queryBabySieveCount(query)); + query.start(1).end(1); + + return babySieveDao.queryBabySieve(query.addOrder(Sort.Direction.DESC, "testNumber")); + } + public BabySieveModel getBabySieveQueryBybabyId(String id){ BabySieveQuery babySieveQuery = new BabySieveQuery(); babySieveQuery.setBabyId(id); diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java index d92d3ee..782108c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java @@ -1753,6 +1753,10 @@ public class MaternalDeliverModel extends BaseModel { private String ssRecord;//手术记录 private Map ssCount;//手术清点 private String ssProcedure;//所施手术 + private String pgcCxl;//剖宫产出血量 + private String totalTwoCxl;//阴道分娩产后2小时总出血量 + private String gongjing;//宫颈（0：无破；1：撕裂；2：其他） + private String gjOther;//宫颈其它； public Integer getParity() { return parity; @@ -1929,4 +1933,36 @@ public class MaternalDeliverModel extends BaseModel { public void setSsProcedure(String ssProcedure) { this.ssProcedure = ssProcedure; } + + public String getPgcCxl() { + return pgcCxl; + } + + public void setPgcCxl(String pgcCxl) { + this.pgcCxl = pgcCxl; + } + + public String getTotalTwoCxl() { + return totalTwoCxl; + } + + public void setTotalTwoCxl(String totalTwoCxl) { + this.totalTwoCxl = totalTwoCxl; + } + + public String getGongjing() { + return gongjing; + } + + public void setGongjing(String gongjing) { + this.gongjing = gongjing; + } + + public String getGjOther() { + return gjOther; + } + + public void setGjOther(String gjOther) { + this.gjOther = gjOther; + } } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabySieveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabySieveQuery.java index c7408f9..211fe9d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabySieveQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabySieveQuery.java @@ -23,7 +23,7 @@ public class BabySieveQuery extends BaseQuery implements IConvertToNativeQuery { private List listBabyId;//儿童建档ID集合 private Date applyDateStrat;//申请开始时间 private Date applyDateEnd;//申请结束时间 - private String testNumber;//血样码 + private String testNumber;//血卡编号 private String collectHospitalId;//申请医院（采血单位） private String sendCheckHospitalId;//送检医院 private String order;//排序 @@ -153,7 +153,7 @@ public class BabySieveQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("babyId", listBabyId, MongoOper.IN); } if(testNumber != null){ - condition = condition.and("testNumber", testNumber, MongoOper.IS); + condition = condition.and("xkNo", testNumber, MongoOper.IS); } if(collectHospitalId != null){ condition = condition.and("collectHospitalId", collectHospitalId, MongoOper.IS); diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java index 1e8d18a..dfa01b6 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java @@ -102,7 +102,7 @@ public class CdGwInterface { String qhId = ""; try { - conn.setAutoCommit(false); + //conn.setAutoCommit(false); //医疗机构编码 String code = ""; //民族代码 @@ -346,7 +346,7 @@ public class CdGwInterface { int adress07 = ps.executeUpdate(); if (adress07 > 0) { - conn.commit();//提交事务 + //conn.commit();//提交事务 br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); return br; @@ -371,11 +371,11 @@ public class CdGwInterface { } catch (Exception e) { - try{ + /*try{ conn.rollback();//出现错误回滚事务 }catch (SQLException exc){ exc.printStackTrace(); - } + }*/ e.printStackTrace(); @@ -429,7 +429,7 @@ public class CdGwInterface { String qhId = ""; try{ - conn.setAutoCommit(false); + //conn.setAutoCommit(false); Patients patients = patientsService.findOnePatientById(antExChuModel.getParentId()); //查询智业民族代码 @@ -519,7 +519,7 @@ public class CdGwInterface { ps = conn.prepareStatement(delSql); int delCount = ps.executeUpdate(); if (delCount > 0) { - conn.commit();//提交事务 + //conn.commit();//提交事务 System.out.print("初诊数据删除成功，请重新插入！"); } @@ -1088,18 +1088,18 @@ public class CdGwInterface { } - conn.commit();//提交事务 + //conn.commit();//提交事务 return br; } } }catch (Exception e){ - try{ + /*try{ conn.rollback();//出现错误回滚事务 }catch (SQLException exc){ exc.printStackTrace(); - } + }*/ e.printStackTrace(); }finally { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabySieveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabySieveController.java index e9191ce..1c5c593 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabySieveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabySieveController.java @@ -11,6 +11,7 @@ import com.lyms.platform.operate.web.request.BabySieveAddRequest; import com.lyms.platform.operate.web.request.SieveAddRequest; import com.lyms.platform.operate.web.result.BabySieveResult; import org.apache.commons.lang.StringUtils; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -157,4 +158,19 @@ public class BabySieveController extends BaseController{ return babySieveFacede.newSieveLabResult(testNum); } + /** + * 新生儿实验室 + * @param xkNo 血卡编号 + * @param request + * @return + */ + @TokenRequired + @ResponseBody + @RequestMapping(value = "/generate",method = RequestMethod.GET) + public BaseResponse generate(@RequestParam("xkNo") String xkNo,HttpServletRequest request) { + Integer userId = ((LoginContext) request.getAttribute("loginContext")).getId(); + //babySieveAddRequest.setOperatorId(1000000185); + return babySieveFacede.generate(xkNo,userId); + } + } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java index 6d32791..42e7de8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java @@ -920,24 +920,14 @@ public class BabySieveFacede { if("NTSHS".equals(name)){ if(list != null && list.size()>0){ for(int j = 2;j=11){ - newSieveLabModel.setTestNumber(array[6]); - newSieveLabModel.setNtshsyingguang(array[11]); - newSieveLabModel.setNtshsnongdu(array[16]); - babySieveService.addNewSieveLab(newSieveLabModel); - }else if(j>=101){ - newSieveLabModel.setTestNumber(array[5]); - newSieveLabModel.setNtshsyingguang(array[10]); - newSieveLabModel.setNtshsnongdu(array[15]); - babySieveService.addNewSieveLab(newSieveLabModel); - }else{ - newSieveLabModel.setTestNumber(array[7]); - newSieveLabModel.setNtshsyingguang(array[12]); - newSieveLabModel.setNtshsnongdu(array[17]); - babySieveService.addNewSieveLab(newSieveLabModel); - } + newSieveLabModel.setTestNumber(array[3]); + newSieveLabModel.setNtshsyingguang(array[4]); + newSieveLabModel.setNtshsnongdu(array[5]); + babySieveService.addNewSieveLab(newSieveLabModel); } @@ -945,11 +935,13 @@ public class BabySieveFacede { }else{ if(list != null && list.size()>0){ for(int j = 2;j list1 = babySieveService.getBabySieveQuery(babySieveQuery); + if(list1 != null && list1.size() > 0){ + babySieveModel = list1.get(0); + //倒序查询最大的初筛试验号 + List list = babySieveService.getBabySieveQuery1(babySieveQuery); + if(list != null && list.size() > 0){ + String today = DateUtil.getymd(); + //判断初筛试验号是否有值（确定第一次使用系统的时间，来编号） + if(StringUtils.isNotEmpty(list.get(0).getTestNumber())){ + String num = list.get(0).getTestNumber(); + //比较今天是否有新生儿做过新筛检查 + if(today.equals(num.substring(0,8))){ + String shu = num.substring(8); + int can = Integer.parseInt(shu); + babySieveModel.setTestNumber((num.substring(0, 8)) + String.valueOf(can + 1)); + }else{ + babySieveModel.setTestNumber(today+"0001"); + } + }else{ + babySieveModel.setTestNumber(today+"0001"); + } + } + String hospital = autoMatchFacade.getHospitalId(userId); + babySieveService.updateBabySieveById(babySieveModel,babySieveModel.getId()); + //添加记录 + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospital), list1.get(0), babySieveModel, OptActionEnums.UPDATE.getId(), "修改新生儿筛查申请记录中的初筛实验号"); + }else{ + return br.setErrorcode(ErrorCodeConstants.USER_NOT_EXISTS).setErrormsg("未找到申请儿童信息！"); + } + br.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(babySieveModel); + + return br; + } + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 468657f..dd47e1e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -2775,7 +2775,10 @@ public class ViewFacade { map.put("ssRecord",data.getSsRecord()); map.put("ssCount",data.getSsCount()); map.put("ssProcedure",data.getSsProcedure()); - + map.put("pgcCxl",data.getPgcCxl()); + map.put("totalTwoCxl",data.getTotalTwoCxl()); + map.put("gongjing", data.getGongjing()); + map.put("gjOther",data.getGjOther()); /* 产后生理 */ map.put("maternalInfo", data.getMaternalInfo() == null ? "" : CfEnums.getTitle(data.getMaternalInfo())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java index 90471c4..525de31 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java @@ -277,6 +277,38 @@ public class MatDeliverAddRequest implements IBasicRequestConvert ssCount;//手术清点 private String ssProcedure;//所施手术 + private String pgcCxl;//剖宫产出血量 + private String totalTwoCxl;//阴道分娩产后2小时总出血量 + private String gongjing;//宫颈（0：无破；1：撕裂；2：其他） + private String gjOther;//宫颈其它； @Override @@ -376,6 +412,10 @@ public class MatDeliverAddRequest implements IBasicRequestConvert ssCount;//手术清点 private String ssProcedure;//所施手术 + private String pgcCxl;//剖宫产出血量 + private String totalTwoCxl;//阴道分娩产后2小时总出血量 + private String gongjing;//宫颈（0：无破；1：撕裂；2：其他） + private String gjOther;//宫颈其它； + + public String getPgcCxl() { + return pgcCxl; + } + + public void setPgcCxl(String pgcCxl) { + this.pgcCxl = pgcCxl; + } + + public String getTotalTwoCxl() { + return totalTwoCxl; + } + + public void setTotalTwoCxl(String totalTwoCxl) { + this.totalTwoCxl = totalTwoCxl; + } + + public String getGongjing() { + return gongjing; + } + + public void setGongjing(String gongjing) { + this.gongjing = gongjing; + } + + public String getGjOther() { + return gjOther; + } + + public void setGjOther(String gjOther) { + this.gjOther = gjOther; + } public String getSsProcedure() { return ssProcedure; @@ -369,6 +405,10 @@ public class MaternalDeliverResult { setSsRecord(destModel.getSsRecord()); setSsCount(destModel.getSsCount()); setSsProcedure(destModel.getSsProcedure()); + setPgcCxl(destModel.getPgcCxl()); + setTotalTwoCxl(destModel.getTotalTwoCxl()); + setGongjing(destModel.getGongjing()); + setGjOther(destModel.getGjOther()); return this; } -- 1.8.3.1