liquanyu / regional-platform

Download as
Browse Code »

Commit 96ca94cae81c09af442db935f599dfb558fee313

Authored by liquanyu
1 parent 6ec86a6437
Exists in master and in 1 other branch dev

update

Showing 16 changed files with 315 additions and 15 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java View file @ 96ca94c
... ... @@ -187,7 +187,7 @@
187 187  
188 188 public AntExRecordModel convert(AntenatalExaminationModel antEx) {
189 189 AntExRecordModel antExRecordModel = new AntExRecordModel();
190   -
  190 + antExRecordModel.setOperaterUserId(antEx.getOperaterUserId());
191 191 antExRecordModel.setZyzlState(antEx.getZyzlState());
192 192 antExRecordModel.setZyzlContent(antEx.getZyzlContent());
193 193 antExRecordModel.setZywzzlState(antEx.getZywzzlState());
... ... @@ -264,6 +264,7 @@
264 264  
265 265 public AntExRecordModel convert(AntExChuModel antExChuModel) {
266 266 AntExRecordModel antExRecordModel = new AntExRecordModel();
  267 + antExRecordModel.setOperaterUserId(antExChuModel.getOperaterUserId());
267 268 antExRecordModel.setTreatOpinion(antExChuModel.getTreatOpinion());
268 269 antExRecordModel.setScreenResult(antExChuModel.getScreenResult());
269 270 antExRecordModel.setCheckDoctor(antExChuModel.getProdDoctor());
platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java View file @ 96ca94c
... ... @@ -474,6 +474,16 @@
474 474 //患者签名
475 475 private String patientSign;
476 476  
  477 + //操作人id
  478 + private String operaterUserId;
  479 +
  480 + public String getOperaterUserId() {
  481 + return operaterUserId;
  482 + }
  483 +
  484 + public void setOperaterUserId(String operaterUserId) {
  485 + this.operaterUserId = operaterUserId;
  486 + }
477 487 public String getDoctorSign() {
478 488 return doctorSign;
479 489 }
platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java View file @ 96ca94c
... ... @@ -116,6 +116,17 @@
116 116 //处理意见
117 117 private String treatOpinion;
118 118  
  119 + //操作人id
  120 + private String operaterUserId;
  121 +
  122 + public String getOperaterUserId() {
  123 + return operaterUserId;
  124 + }
  125 +
  126 + public void setOperaterUserId(String operaterUserId) {
  127 + this.operaterUserId = operaterUserId;
  128 + }
  129 +
119 130 public int getDueStatus() {
120 131 return dueStatus;
121 132 }
platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java View file @ 96ca94c
... ... @@ -369,6 +369,17 @@
369 369 //羊水量
370 370 private String bamnio;
371 371  
  372 + //操作人id
  373 + private String operaterUserId;
  374 +
  375 + public String getOperaterUserId() {
  376 + return operaterUserId;
  377 + }
  378 +
  379 + public void setOperaterUserId(String operaterUserId) {
  380 + this.operaterUserId = operaterUserId;
  381 + }
  382 +
372 383 public String getBamnio() {
373 384 return bamnio;
374 385 }
platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java View file @ 96ca94c
... ... @@ -82,6 +82,17 @@
82 82  
83 83 private Boolean isOpinion;
84 84  
  85 + //操作人id
  86 + private String operaterUserId;
  87 +
  88 + public String getOperaterUserId() {
  89 + return operaterUserId;
  90 + }
  91 +
  92 + public void setOperaterUserId(String operaterUserId) {
  93 + this.operaterUserId = operaterUserId;
  94 + }
  95 +
85 96 public Date getNextCheckTimeStart() {
86 97 return nextCheckTimeStart;
87 98 }
... ... @@ -600,6 +611,9 @@
600 611 }
601 612 if (StringUtils.isNotEmpty(phone)) {
602 613 condition = condition.and("phone", phone, MongoOper.IS);
  614 + }
  615 + if (StringUtils.isNotEmpty(operaterUserId)) {
  616 + condition = condition.and("operaterUserId", operaterUserId, MongoOper.IS);
603 617 }
604 618 if (null != id) {
605 619 condition = condition.and("id", id, MongoOper.IS);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java View file @ 96ca94c
... ... @@ -525,8 +525,10 @@
525 525 @RequestParam(value = "pid") String pid,
526 526 @RequestParam(value = "hospitalId") String hospitalId,
527 527 @RequestParam(value = "nextTime", required = false) String nextTime,
528   - @RequestParam(value = "doctorId", required = false) String doctorId) {
529   - return antExRecordFacade.inputWxData(fuh, abdominalGirth, fhr, pid, hospitalId, nextTime, doctorId);
  528 + @RequestParam(value = "doctorId", required = false) String doctorId,
  529 + @RequestParam(value = "edema", required = false) String edema
  530 + ) {
  531 + return antExRecordFacade.inputWxData(fuh, abdominalGirth, fhr,edema, pid, hospitalId, nextTime, doctorId);
530 532 }
531 533  
532 534 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ 96ca94c
... ... @@ -18,10 +18,7 @@
18 18 import com.lyms.platform.operate.web.utils.UnitConstants;
19 19 import com.lyms.platform.operate.web.utils.UnitUtils;
20 20 import com.lyms.platform.operate.web.worker.AntExRecordWorker;
21   -import com.lyms.platform.permission.model.CheckItem;
22   -import com.lyms.platform.permission.model.Organization;
23   -import com.lyms.platform.permission.model.OrganizationQuery;
24   -import com.lyms.platform.permission.model.Users;
  21 +import com.lyms.platform.permission.model.*;
25 22 import com.lyms.platform.permission.service.CheckItemService;
26 23 import com.lyms.platform.permission.service.OrganizationService;
27 24 import com.lyms.platform.permission.service.UsersService;
... ... @@ -123,6 +120,7 @@
123 120 AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
124 121  
125 122 antExRecordQuery.setDueStatus(antExManagerQueryRequest.getDeuStatus());
  123 + antExRecordQuery.setOperaterUserId(antExManagerQueryRequest.getOperaterUserId());
126 124  
127 125 antExRecordQuery.setZyzlState(antExManagerQueryRequest.getZyzlState());
128 126 antExRecordQuery.setZywzzlState(antExManagerQueryRequest.getZywzzlState());
... ... @@ -1600,6 +1598,8 @@
1600 1598 return;
1601 1599 }
1602 1600  
  1601 + boolean isInput = false;
  1602 +
1603 1603 List<AntExChuModel> antExChuModels = mongoTemplate.find(Query.query(Criteria.where("pid").is(pid).and("yn").is(YnEnums.YES.getId())), AntExChuModel.class);
1604 1604 if (CollectionUtils.isNotEmpty(antExChuModels)) {
1605 1605 for (AntExChuModel model : antExChuModels) {
... ... @@ -1609,7 +1609,7 @@
1609 1609 model.setHeight(nutritionInfoRequest.getBeforeHeight());
1610 1610 model.setYqWeight(nutritionInfoRequest.getBeforeWeight());
1611 1611 antenatalExaminationService.updateAntExChu(model, model.getId());
1612   - break;
  1612 + isInput = true;
1613 1613 }
1614 1614 }
1615 1615 }
1616 1616  
... ... @@ -1621,9 +1621,15 @@
1621 1621 DateUtil.getyyyy_MM_dd(new Date()).equals(DateUtil.getyyyy_MM_dd(model.getCheckDate()))) {
1622 1622 model.setWeight(Double.parseDouble(nutritionInfoRequest.getCurrentWeight()));
1623 1623 antenatalExaminationService.updateOneAnt(model, model.getId());
  1624 + isInput = true;
1624 1625 }
1625 1626 }
1626 1627 }
  1628 +
  1629 + if (!isInput)
  1630 + {
  1631 + inputData(nutritionInfoRequest);
  1632 + }
1627 1633 }
1628 1634  
1629 1635  
... ... @@ -1639,7 +1645,7 @@
1639 1645 * @param doctorId
1640 1646 * @return
1641 1647 */
1642   - public BaseResponse inputWxData(String fuh, String abdominalGirth, String fhr, String pid, String hospitalId, String nextTime, String doctorId) {
  1648 + public BaseResponse inputWxData(String fuh, String abdominalGirth, String fhr,String edema, String pid, String hospitalId, String nextTime, String doctorId) {
1643 1649 WxMeasureInfoModel wxMeasureInfo = new WxMeasureInfoModel();
1644 1650 boolean falg = true;
1645 1651 if (StringUtils.isNotEmpty(pid) && StringUtils.isNotEmpty(hospitalId)) {
... ... @@ -1666,6 +1672,8 @@
1666 1672  
1667 1673 model.setTireNumber(list.size() + "");
1668 1674 }
  1675 + model.setCheckDoctor(doctorId);
  1676 + model.setEdema(edema);
1669 1677 antenatalExaminationService.updateOneAnt(model, model.getId());
1670 1678 falg = false;
1671 1679 break;
... ... @@ -1702,6 +1710,7 @@
1702 1710 AntExAddRequest antExAddRequest = new AntExAddRequest();
1703 1711 antExAddRequest.setCheckDate(DateUtil.getyyyy_MM_dd(new Date()));
1704 1712 antExAddRequest.setCheckDoctor(doctorId);
  1713 + antExAddRequest.setEdema(edema);
1705 1714 antExAddRequest.setDiagnosisOther(DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));// diagnosisOther: "29+4周妊娠 "
1706 1715 antExAddRequest.setCurrentDueDate(DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));//currentDueDate: "孕29周+4天"
1707 1716 antExAddRequest.setParentId(patients.getId());
... ... @@ -1849,6 +1858,141 @@
1849 1858 Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(wxMeasureInfoModel));
1850 1859 mongoTemplate.updateFirst(Query.query(Criteria.where("pid").is(pid)), update, WxMeasureInfoModel.class);
1851 1860 }
  1861 + } else {
  1862 + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("未获取到医院名称!");
  1863 + }
  1864 + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
  1865 + }
  1866 +
  1867 +
  1868 +
  1869 +
  1870 + public BaseResponse inputData(NutritionInfoRequest nutritionInfoRequest) {
  1871 + boolean falg = true;
  1872 + if (StringUtils.isNotEmpty(nutritionInfoRequest.getPid()) && StringUtils.isNotEmpty(nutritionInfoRequest.getHospitalId())) {
  1873 + if (isOpenAutoSaveAntenatal(nutritionInfoRequest.getHospitalId())) {
  1874 + List<AntenatalExaminationModel> examinationModel = mongoTemplate.find(Query.query(Criteria.where("pid").is(nutritionInfoRequest.getPid())),
  1875 + AntenatalExaminationModel.class);
  1876 + if (CollectionUtils.isNotEmpty(examinationModel)) {
  1877 + for (AntenatalExaminationModel model : examinationModel) {
  1878 + if (StringUtils.isNotEmpty(DateUtil.getyyyy_MM_dd(model.getCheckDate())) &&
  1879 + DateUtil.getyyyy_MM_dd(new Date()).equals(DateUtil.getyyyy_MM_dd(model.getCheckDate()))) {
  1880 + model.setWeight(Double.parseDouble(nutritionInfoRequest.getCurrentWeight()));
  1881 + if (StringUtils.isNotEmpty(nutritionInfoRequest.getSsy()) && StringUtils.isNotEmpty(nutritionInfoRequest.getSzy()))
  1882 + {
  1883 + Map map = new HashMap();
  1884 + map.put("ssy",nutritionInfoRequest.getSsy());
  1885 + map.put("szy",nutritionInfoRequest.getSzy());
  1886 + model.setBp(JsonUtil.array2JsonString(map));
  1887 + }
  1888 + antenatalExaminationService.updateOneAnt(model, model.getId());
  1889 + falg = false;
  1890 + break;
  1891 + }
  1892 + }
  1893 + }
  1894 + if (falg) {
  1895 + //创建一条复诊记录
  1896 + Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(nutritionInfoRequest.getPid()).and("hospitalId").is(nutritionInfoRequest.getHospitalId()).and("type").is(1).and("yn").is(1)), Patients.class);
  1897 + //当前医院没有档案,创建隐藏档案
  1898 + if (patients == null)
  1899 + {
  1900 + patients = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(nutritionInfoRequest.getPid()).and("type").is(1).and("yn").is(1).and("source").exists(false)), Patients.class);
  1901 + if (patients != null)
  1902 + {
  1903 + String source = patients.getId();
  1904 + patients.setId(null);
  1905 + patients.setSource(source);
  1906 + patients.setEnable("2");//隐藏档案
  1907 + patients.setHospitalId(nutritionInfoRequest.getHospitalId());
  1908 + patients = patientsService.addPatient(patients);
  1909 + }
  1910 + }
  1911 + if (null != patients) {
  1912 + AntExChuQuery antExChuQuery = new AntExChuQuery();
  1913 + antExChuQuery.setYn(YnEnums.YES.getId());
  1914 + antExChuQuery.setPid(patients.getPid());
  1915 + antExChuQuery.setCheckTimeStart(patients.getLastMenses());
  1916 + antExChuQuery.setCheckTimeEnd(DateUtil.addWeek(patients.getLastMenses(),42));
  1917 + List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery);
  1918 + if (CollectionUtils.isNotEmpty(antExChuModels)) {
  1919 +
  1920 + AntExAddRequest antExAddRequest = new AntExAddRequest();
  1921 + antExAddRequest.setCheckDate(DateUtil.getyyyy_MM_dd(new Date()));
  1922 + antExAddRequest.setDiagnosisOther(DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));// diagnosisOther: "29+4周妊娠 "
  1923 + antExAddRequest.setCurrentDueDate(DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));//currentDueDate: "孕29周+4天"
  1924 + antExAddRequest.setParentId(patients.getId());
  1925 + antExAddRequest.setPid(patients.getPid());
  1926 + HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), true);
  1927 + if (highScoreResult != null) {
  1928 + List<Map<String, Object>> list = highScoreResult.getHighRisk();
  1929 + List<String> stringList = new ArrayList<>();
  1930 + List<Map> maps = new ArrayList<>();
  1931 + for (Map<String, Object> map : list) {
  1932 + if (null != map.get("otherId")) {
  1933 + maps.add(map);
  1934 + } else {
  1935 + stringList.add(map.get("id").toString());
  1936 + }
  1937 + }
  1938 + antExAddRequest.setHighriskDesc(highScoreResult.getHighriskDesc());
  1939 + //高危因素
  1940 + antExAddRequest.setRiskFactor(stringList);
  1941 + //其他高危
  1942 + antExAddRequest.setOtherRisk(maps);
  1943 + }
  1944 + antExAddRequest.setRiskFactor(patients.getRiskFactorId());
  1945 + antExAddRequest.setWeight(Double.parseDouble(nutritionInfoRequest.getCurrentWeight()));
  1946 +
  1947 + antExAddRequest.setTireNumber(nutritionInfoRequest.getTireNumber());
  1948 + GuidelinesQuery guidelinesQuery = new GuidelinesQuery();
  1949 + guidelinesQuery.setType(1);
  1950 +
  1951 + Integer start = DateUtil.getWeek(patients.getLastMenses(), new Date());
  1952 + if (start <= 5) {
  1953 + start = 5;
  1954 + }
  1955 + guidelinesQuery.setMaxStart(start);
  1956 + guidelinesQuery.setMinEnd(start);
  1957 + //System.out.println("指导意见查询条件：" + guidelinesQuery.convertToQuery().convertToMongoQuery());
  1958 + List<Guidelines> lists = guidelinesService.queryGuidelines(guidelinesQuery);
  1959 + StringBuilder stringBuilder = new StringBuilder(128);
  1960 + if (CollectionUtils.isNotEmpty(lists)) {
  1961 + for (Guidelines guidelines : lists) {
  1962 + stringBuilder.append(guidelines.getCategory()).append(" ").append(guidelines.getContent()).append("\r\n");
  1963 + }
  1964 + }
  1965 + antExAddRequest.setGuide(stringBuilder.toString());
  1966 + //获取血压记录
  1967 + List<BloodPressure> bloodPressures = mongoTemplate.find(Query.query(Criteria.where("pid").is(patients.getPid()).and("yn").is(1)), BloodPressure.class);
  1968 + if (CollectionUtils.isNotEmpty(bloodPressures)) {
  1969 + BloodPressure one = bloodPressures.get(0);
  1970 + Map<String, Map<String, Object>> infos = one.getInfos();
  1971 + Map<String, Object> map = infos.get(DateUtil.getyyyy_MM_dd(new Date()));
  1972 + if (map != null && map.size() > 0) {
  1973 + Map mapBp = new HashMap();
  1974 + mapBp.put("ssy", map.get("ssy"));
  1975 + mapBp.put("szy", map.get("szy"));
  1976 + antExAddRequest.setBp(mapBp);
  1977 + }
  1978 + }
  1979 + else
  1980 + {
  1981 + Map mapBp = new HashMap();
  1982 + mapBp.put("ssy", nutritionInfoRequest.getSsy());
  1983 + mapBp.put("szy", nutritionInfoRequest.getSzy());
  1984 + antExAddRequest.setBp(mapBp);
  1985 + }
  1986 +
  1987 + UsersQuery query = new UsersQuery();
  1988 + query.setOrgId(Integer.parseInt(nutritionInfoRequest.getHospitalId()));
  1989 + List<Users> list = usersService.queryUsers(query);
  1990 + antenatalExaminationFacade.addOneAntEx(antExAddRequest, list.get(0).getId());
  1991 + }
  1992 + }
  1993 + }
  1994 + }
  1995 +
1852 1996 } else {
1853 1997 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("未获取到医院名称!");
1854 1998 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java View file @ 96ca94c
... ... @@ -1187,6 +1187,7 @@
1187 1187 bloodPressureService.update(bloodPressure);
1188 1188 }
1189 1189  
  1190 + boolean isInput = false;
1190 1191 //初诊自动填写血压
1191 1192 List<AntExChuModel> antExChuModels = mongoTemplate.find(Query.query(Criteria.where("pid").is(p.getPid()).and("yn").is(YnEnums.YES.getId())), AntExChuModel.class);
1192 1193 if (CollectionUtils.isNotEmpty(antExChuModels)) {
... ... @@ -1199,7 +1200,7 @@
1199 1200 map.put("ssy", bloodPressure.getSsy());
1200 1201 model.setBp(JsonUtil.obj2JsonString(map));
1201 1202 antenatalExaminationService.updateAntExChu(model, model.getId());
1202   - break;
  1203 + isInput = true;
1203 1204 } catch (Exception e) {
1204 1205  
1205 1206 }
1206 1207  
... ... @@ -1226,9 +1227,15 @@
1226 1227 map.put("ssy", bloodPressure.getSsy());
1227 1228 examinationModel.setBp(JsonUtil.obj2JsonString(map));
1228 1229 antenatalExaminationService.updateOneAnt(examinationModel, examinationModel.getId());
  1230 + isInput = true;
1229 1231 } catch (Exception e) {
1230 1232 }
1231 1233  
  1234 + }
  1235 +
  1236 + if (!isInput)
  1237 + {
  1238 + antExRecordFacade.inputData(nutritionInfoRequest);
1232 1239 }
1233 1240  
1234 1241  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 96ca94c
... ... @@ -1760,9 +1760,16 @@
1760 1760 map.put("id", data.getId());
1761 1761 String edema = "";
1762 1762 if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getEdema())) {
1763   - for (FuZhongEnums fuZhongEnums : FuZhongEnums.values()) {
1764   - if (data.getEdema().equals(fuZhongEnums.getId())) {
1765   - edema = fuZhongEnums.getName();
  1763 + if (Integer.parseInt(data.getEdema()) > 3)
  1764 + {
  1765 + edema = "4".equals(data.getEdema()) ? "有" : "无";
  1766 + }
  1767 + else
  1768 + {
  1769 + for (FuZhongEnums fuZhongEnums : FuZhongEnums.values()) {
  1770 + if (data.getEdema().equals(fuZhongEnums.getId())) {
  1771 + edema = fuZhongEnums.getName();
  1772 + }
1766 1773 }
1767 1774 }
1768 1775 }
... ... @@ -1817,6 +1824,18 @@
1817 1824 }
1818 1825 }
1819 1826 map.put("checkDoctor", checkDoctor);
  1827 +
  1828 +
  1829 + String operaterUser = "";
  1830 +
  1831 + if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getOperaterUserId())) {
  1832 + Users users = usersService.getUsers(Integer.parseInt(data.getOperaterUserId()));
  1833 + if (users != null && users.getYn() == YnEnums.YES.getId()) {
  1834 + operaterUser = users.getName();
  1835 + }
  1836 + }
  1837 + map.put("operaterUser", operaterUser);
  1838 +
1820 1839 String hospital = "";
1821 1840 if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getHospitalId())) {
1822 1841 Organization organization = organizationService.getOrganization(Integer.parseInt(data.getHospitalId()));
... ... @@ -3054,7 +3073,14 @@
3054 3073 map.put("treatmentOpinion3", getTreatmentOpinion3(data.getTreatmentOpinion2()));
3055 3074 map.put("quicken", QuickenEnums.getName(data.getQuicken()));
3056 3075 map.put("quickenRemark", data.getQuickenRemark());
3057   -
  3076 + String operaterUser = "";
  3077 + if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getOperaterUserId())) {
  3078 + Users users = usersService.getUsers(Integer.parseInt(data.getOperaterUserId()));
  3079 + if (users != null && users.getYn() == YnEnums.YES.getId()) {
  3080 + operaterUser = users.getName();
  3081 + }
  3082 + }
  3083 + map.put("operaterUser", operaterUser);
3058 3084 //早孕期病毒检测
3059 3085 // private String zyqbdjc;
3060 3086 //nt检查
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java View file @ 96ca94c
... ... @@ -354,6 +354,17 @@
354 354 //羊水量
355 355 private String bamnio;
356 356  
  357 + //操作人id
  358 + private String operaterUserId;
  359 +
  360 + public String getOperaterUserId() {
  361 + return operaterUserId;
  362 + }
  363 +
  364 + public void setOperaterUserId(String operaterUserId) {
  365 + this.operaterUserId = operaterUserId;
  366 + }
  367 +
357 368 public String getBamnio() {
358 369 return bamnio;
359 370 }
... ... @@ -1397,6 +1408,7 @@
1397 1408 examinationModel.setNdbSelectOtherVal(ndbSelectOtherVal);
1398 1409 }
1399 1410 examinationModel.setBamnio(bamnio);
  1411 + examinationModel.setOperaterUserId(operaterUserId);
1400 1412  
1401 1413  
1402 1414  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java View file @ 96ca94c
... ... @@ -114,6 +114,16 @@
114 114 private String nextTime;
115 115 //状态 1 已分娩 2未分娩
116 116 private Integer deuStatus;
  117 + //操作人id
  118 + private String operaterUserId;
  119 +
  120 + public String getOperaterUserId() {
  121 + return operaterUserId;
  122 + }
  123 +
  124 + public void setOperaterUserId(String operaterUserId) {
  125 + this.operaterUserId = operaterUserId;
  126 + }
117 127  
118 128 public Integer getDeuStatus() {
119 129 return deuStatus;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java View file @ 96ca94c
... ... @@ -468,6 +468,17 @@
468 468 //患者签名
469 469 private String patientSign;
470 470  
  471 + //操作人id
  472 + private String operaterUserId;
  473 +
  474 + public String getOperaterUserId() {
  475 + return operaterUserId;
  476 + }
  477 +
  478 + public void setOperaterUserId(String operaterUserId) {
  479 + this.operaterUserId = operaterUserId;
  480 + }
  481 +
471 482 public String getDoctorSign() {
472 483 return doctorSign;
473 484 }
... ... @@ -2365,6 +2376,7 @@
2365 2376 }
2366 2377  
2367 2378 antExChuModel.setCheckResult(checkResult);
  2379 + antExChuModel.setOperaterUserId(operaterUserId);
2368 2380 return antExChuModel;
2369 2381 }
2370 2382  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java View file @ 96ca94c
... ... @@ -75,6 +75,16 @@
75 75  
76 76 //户籍地址
77 77 private String address;
  78 + //操作人id
  79 + private String operaterUser;
  80 +
  81 + public String getOperaterUser() {
  82 + return operaterUser;
  83 + }
  84 +
  85 + public void setOperaterUser(String operaterUser) {
  86 + this.operaterUser = operaterUser;
  87 + }
78 88  
79 89 public String getCardNo() {
80 90 return cardNo;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java View file @ 96ca94c
... ... @@ -532,7 +532,16 @@
532 532 private String aTSHR;
533 533  
534 534 private List secondaryDiagnosisId;
  535 + //操作人id
  536 + private String operaterUserId;
535 537  
  538 + public String getOperaterUserId() {
  539 + return operaterUserId;
  540 + }
  541 +
  542 + public void setOperaterUserId(String operaterUserId) {
  543 + this.operaterUserId = operaterUserId;
  544 + }
536 545 public List getSecondaryDiagnosisId() {
537 546 return secondaryDiagnosisId;
538 547 }
... ... @@ -1279,6 +1288,7 @@
1279 1288 setSyjg(destModel.getSyjg());
1280 1289 setHivkt(destModel.getHivkt());
1281 1290 setBamnio(destModel.getBamnio());
  1291 + setOperaterUserId(destModel.getOperaterUserId());
1282 1292  
1283 1293 return this;
1284 1294 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java View file @ 96ca94c
... ... @@ -1980,6 +1980,16 @@
1980 1980 public void setCheckResult(String checkResult) {
1981 1981 this.checkResult = checkResult;
1982 1982 }
  1983 + //操作人id
  1984 + private String operaterUserId;
  1985 +
  1986 + public String getOperaterUserId() {
  1987 + return operaterUserId;
  1988 + }
  1989 +
  1990 + public void setOperaterUserId(String operaterUserId) {
  1991 + this.operaterUserId = operaterUserId;
  1992 + }
1983 1993 public AntexChuResult convertToResult(AntExChuModel antExChuModel) {
1984 1994 if (null != antExChuModel) {
1985 1995 setSecondaryDiagnosis(antExChuModel.getSecondaryDiagnosis());
... ... @@ -2251,7 +2261,7 @@
2251 2261 setPregnancyExcpetion(antExChuModel.getPregnancyExcpetion());
2252 2262 setMonthCompliance(antExChuModel.getMonthCompliance());
2253 2263 setCheckResult(antExChuModel.getCheckResult());
2254   -
  2264 + setOperaterUserId(antExChuModel.getOperaterUserId());
2255 2265 }
2256 2266 return this;
2257 2267 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java View file @ 96ca94c
... ... @@ -118,6 +118,16 @@
118 118 }
119 119 }
120 120  
  121 + //产检医生
  122 + if (org.apache.commons.lang.StringUtils.isNotEmpty(e.getOperaterUserId())) {
  123 + if (NumberUtils.isNumber(e.getOperaterUserId())) {
  124 + Users users = usersService.getUsers(NumberUtils.toInt(e.getOperaterUserId()));
  125 + if (null != users) {
  126 + antExManagerResult.setOperaterUser(users.getName());
  127 + }
  128 + }
  129 + }
  130 +
121 131 AntExRecordQuery antExRecordQuery1 = new AntExRecordQuery();
122 132 Patients patients = patientsService.findOnePatientById(e.getParentId());
123 133 antExRecordQuery1.setCheckTimeStart(patients.getLastMenses());