jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 6eb2323fb8cf5030a6dc9e30baaeebe3b0aef1e5

Authored by wtt
2 parents da1aee9bc6 d564acc195
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 12 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java View file @ 6eb2323
... ... @@ -6560,6 +6560,60 @@
6560 6560 }
6561 6561 }
6562 6562  
  6563 +
  6564 + public static void saveBabyBone(String fileName) {
  6565 + ApplicationContext applicationContext = new ClassPathXmlApplicationContext("classpath:/spring/applicationContext_biz_patient1.xml");
  6566 + MongoTemplate mongoTemplate
  6567 + = (MongoTemplate) applicationContext.getBean("mongoTemplate");
  6568 + mongoTemplate.getDb().authenticate("platform", "platform123".toCharArray());
  6569 + File file = new File(fileName);
  6570 + Workbook wb = null;
  6571 + try {
  6572 + wb = Workbook.getWorkbook(file);
  6573 +
  6574 + Sheet s = wb.getSheet(0);
  6575 + System.out.println(s.getName() + " : ");
  6576 + int rows = s.getRows();
  6577 + if (rows > 0) {
  6578 + //遍历每行
  6579 + for (int i = 1; i < rows; i++) {
  6580 + System.out.println("rows=" + i);
  6581 + BoneConfigModel model = new BoneConfigModel();
  6582 + model.setType(1);
  6583 + Cell[] cells = s.getRow(i);
  6584 + if (cells.length > 0) {
  6585 + for (int j = 0; j < cells.length; j++) {
  6586 + String str = cells[j].getContents().trim();
  6587 + switch (j) {
  6588 + case 0:
  6589 + String[] arrs = str.split("-");
  6590 + model.setStart(Integer.parseInt(arrs[0]));
  6591 + model.setEnd(Integer.parseInt(arrs[1]));
  6592 + continue;
  6593 + case 1:
  6594 + List<String> list2 = Arrays.asList(str.split("\n"));
  6595 + model.setNormals(list2);
  6596 + continue;
  6597 + case 2:
  6598 + List<String> list3 = Arrays.asList(str.split("\n"));
  6599 + model.setReduces(list3);
  6600 + continue;
  6601 + case 3:
  6602 + List<String> list4 = Arrays.asList(str.split("\n"));
  6603 + model.setSerious(list4);
  6604 + continue;
  6605 +
  6606 + }
  6607 + }
  6608 + }
  6609 + mongoTemplate.save(model);
  6610 + }
  6611 + }
  6612 + } catch (Exception e) {
  6613 + e.printStackTrace();
  6614 + }
  6615 + }
  6616 +
6563 6617 public static void main(String[] args) {
6564 6618 // getData();
6565 6619 //weightWeek("F:\\体重与营养管理\\体重与营养管理第三版（北方）改标红“、冰淇淋”-晓萌.xls");
... ... @@ -6607,7 +6661,8 @@
6607 6661 //saveDiteSuggest("F:\\儿童营养报告\\秦皇岛儿童膳食营养报告\\每类食物不爱吃的指导建议.xls");
6608 6662 //saveDiteDoctorSuggest("F:\\儿童营养报告\\秦皇岛儿童膳食营养报告\\医生建议内容.xls");
6609 6663 //saveMicroelements("E:\\dev\\微量元素指导报告模板.xls");
6610   - saveBabyMicroelements("F:\\技术文档\\儿童微量元素\\儿童微量元素指导报告模板.xls");
  6664 + //saveBabyMicroelements("F:\\技术文档\\儿童微量元素\\儿童微量元素指导报告模板.xls");
  6665 + saveBabyBone("F:\\技术文档\\骨密度\\儿童骨密度报告模板内容表.xls");
6611 6666  
6612 6667 }
6613 6668  
platform-dal/src/main/java/com/lyms/platform/pojo/BoneConfigModel.java View file @ 6eb2323
  1 +package com.lyms.platform.pojo;
  2 +
  3 +import com.lyms.platform.common.result.BaseModel;
  4 +import org.springframework.data.mongodb.core.mapping.Document;
  5 +
  6 +import java.util.List;
  7 +
  8 +/**
  9 + * 骨密度
  10 + *
  11 + */
  12 +@Document(collection = "lyms_bone_config")
  13 +public class BoneConfigModel extends BaseModel {
  14 +
  15 +
  16 + private String id;
  17 +
  18 + private Integer start;
  19 + private Integer end;
  20 + //正常
  21 + private List<String> normals;
  22 + //减少
  23 + private List<String> reduces;
  24 + //严重
  25 + private List<String> serious;
  26 +
  27 +
  28 + //0 孕前 1 儿童
  29 + private Integer type;
  30 +
  31 +
  32 + public String getId() {
  33 + return id;
  34 + }
  35 +
  36 + public void setId(String id) {
  37 + this.id = id;
  38 + }
  39 +
  40 + public Integer getStart() {
  41 + return start;
  42 + }
  43 +
  44 + public void setStart(Integer start) {
  45 + this.start = start;
  46 + }
  47 +
  48 + public Integer getEnd() {
  49 + return end;
  50 + }
  51 +
  52 + public void setEnd(Integer end) {
  53 + this.end = end;
  54 + }
  55 +
  56 + public List<String> getNormals() {
  57 + return normals;
  58 + }
  59 +
  60 + public void setNormals(List<String> normals) {
  61 + this.normals = normals;
  62 + }
  63 +
  64 + public List<String> getReduces() {
  65 + return reduces;
  66 + }
  67 +
  68 + public void setReduces(List<String> reduces) {
  69 + this.reduces = reduces;
  70 + }
  71 +
  72 + public List<String> getSerious() {
  73 + return serious;
  74 + }
  75 +
  76 + public void setSerious(List<String> serious) {
  77 + this.serious = serious;
  78 + }
  79 +
  80 + public Integer getType() {
  81 + return type;
  82 + }
  83 +
  84 + public void setType(Integer type) {
  85 + this.type = type;
  86 + }
  87 +}
platform-dal/src/main/java/com/lyms/platform/pojo/BoneModel.java View file @ 6eb2323
... ... @@ -61,7 +61,7 @@
61 61 //0 孕前 1 儿童
62 62 private Integer type;
63 63  
64   - //0正常 1骨质减少 2 骨质疏松
  64 + //孕期(0正常 1骨质减少 2 骨质疏松) 儿童(0正常 1骨质减少 2 严重骨质减少)
65 65 private Integer result;
66 66  
67 67 private String cardNo;
platform-operate-api/src/main/java/com/lyms/hospitalapi/lcfy/LisService.java View file @ 6eb2323
... ... @@ -57,7 +57,7 @@
57 57 itemsMan.put("lyms011","肾功能检测（肌酐）");
58 58 itemsMan.put("lyms013","梅毒螺旋体筛查");
59 59 Connection conn = null;
60   - String sql = "insert into TI_申请信息孕(v患者类别,v患者编号,v患者ID号,v患者姓名,v性别,v年龄,v年龄类型,v申请项目编码,v申请项目名称," +
  60 + String sql = "insert into TI_申请信息(v患者类别,v患者编号,v患者ID号,v患者姓名,v性别,v年龄,v年龄类型,v申请项目编码,v申请项目名称," +
61 61 "v唯一标识号,iTag,v手机号,v身份证号,d申请时间,v申请日期,i项目数量) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
62 62 PreparedStatement ps = null;
63 63 ResultSet rs = null;
... ... @@ -176,7 +176,7 @@
176 176 itemsMan.put("lymsh011","肾功能检测（肌酐）");
177 177 itemsMan.put("lymsh013","梅毒螺旋体筛查");
178 178 Connection conn = null;
179   - String sql = "insert into TI_申请信息孕(v患者类别,v患者编号,v患者ID号,v患者姓名,v性别,v年龄,v年龄类型,v申请项目编码,v申请项目名称," +
  179 + String sql = "insert into TI_申请信息(v患者类别,v患者编号,v患者ID号,v患者姓名,v性别,v年龄,v年龄类型,v申请项目编码,v申请项目名称," +
180 180 "v唯一标识号,iTag,v手机号,v身份证号,d申请时间,v申请日期,i项目数量) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
181 181 PreparedStatement ps = null;
182 182 ResultSet rs = null;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java View file @ 6eb2323
... ... @@ -159,14 +159,14 @@
159 159 @RequestParam(value = "hospitalId", required = true) String hospitalId,
160 160 HttpServletRequest request
161 161 ) {
162   - if ("216".equals(hospitalId))
163   - {
164   - try {
165   - Thread.sleep(4000);
166   - } catch (InterruptedException e) {
167   - e.printStackTrace();
168   - }
169   - }
  162 +// if ("216".equals(hospitalId))
  163 +// {
  164 +// try {
  165 +// Thread.sleep(4000);
  166 +// } catch (InterruptedException e) {
  167 +// e.printStackTrace();
  168 +// }
  169 +// }
170 170 return measureInfoFacade.getNutritionPatientInfo(certType, certNo, hospitalId);
171 171 }
172 172  
... ... @@ -182,14 +182,14 @@
182 182 public BaseObjectResponse addNutritionInfo(@RequestBody NutritionInfoRequest nutritionInfoRequest,
183 183 HttpServletRequest request
184 184 ) {
185   - if ("216".equals(nutritionInfoRequest.getHospitalId()))
186   - {
187   - try {
188   - Thread.sleep(4000);
189   - } catch (InterruptedException e) {
190   - e.printStackTrace();
191   - }
192   - }
  185 +// if ("216".equals(nutritionInfoRequest.getHospitalId()))
  186 +// {
  187 +// try {
  188 +// Thread.sleep(4000);
  189 +// } catch (InterruptedException e) {
  190 +// e.printStackTrace();
  191 +// }
  192 +// }
193 193 return measureInfoFacade.addNutritionInfo(nutritionInfoRequest);
194 194 }
195 195  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java View file @ 6eb2323
... ... @@ -14,10 +14,7 @@
14 14 import com.lyms.platform.common.result.BaseResponse;
15 15 import com.lyms.platform.common.utils.DateUtil;
16 16 import com.lyms.platform.operate.web.utils.FunvCommonUtil;
17   -import com.lyms.platform.pojo.BabyModel;
18   -import com.lyms.platform.pojo.BoneModel;
19   -import com.lyms.platform.pojo.MicroelementModel;
20   -import com.lyms.platform.pojo.Patients;
  17 +import com.lyms.platform.pojo.*;
21 18 import com.lyms.platform.query.BabyModelQuery;
22 19 import com.lyms.platform.query.BoneQuery;
23 20 import com.lyms.platform.query.PatientsQuery;
... ... @@ -25,6 +22,8 @@
25 22 import org.apache.commons.lang.StringUtils;
26 23 import org.springframework.beans.factory.annotation.Autowired;
27 24 import org.springframework.data.mongodb.core.MongoTemplate;
  25 +import org.springframework.data.mongodb.core.query.Criteria;
  26 +import org.springframework.data.mongodb.core.query.Query;
28 27 import org.springframework.stereotype.Component;
29 28  
30 29 import java.util.*;
... ... @@ -54,6 +53,9 @@
54 53 @Autowired
55 54 private BabyBookbuildingService babyBookbuildingService;
56 55  
  56 + @Autowired
  57 + private MongoTemplate mongoTemplate;
  58 +
57 59 public BaseResponse queryBoneList(String queryNo, Integer start, Integer end, Integer age, String vcCardNo,Integer type ,Integer page, Integer limit, Integer userId) {
58 60  
59 61  
... ... @@ -201,6 +203,7 @@
201 203 BoneModel model = BoneService.queryOneBone(query);
202 204 if (model != null)
203 205 {
  206 + //孕期骨密度报告
204 207 if (type == 0)
205 208 {
206 209 Patients pat = patientsService.findOnePatientById(model.getPatientId());
... ... @@ -224,6 +227,7 @@
224 227 int week = DateUtil.getWeek(lastMenses,model.getCreated());
225 228  
226 229 }
  230 + //儿童骨密度报告
227 231 else
228 232 {
229 233 BabyModel babyModel = babyBookbuildingService.queryBabyBuildById(model.getPatientId());
230 234  
... ... @@ -244,9 +248,21 @@
244 248 data.put("sex", babyModel.getSex() == null ? "" : SexEnum.getTextById(babyModel.getSex()));
245 249 data.put("created", DateUtil.getyyyy_MM_dd(model.getCreated()));
246 250 int month = DateUtil.getBabyAgeMonth(babyModel.getBirth(),model.getCreated());
247   - }
248 251  
249   -
  252 + List<BoneConfigModel> configModels = mongoTemplate.find(
  253 + Query.query(Criteria.where("type").is(1)), BoneConfigModel.class);
  254 + if (CollectionUtils.isNotEmpty(configModels))
  255 + {
  256 + for (BoneConfigModel configModel : configModels)
  257 + {
  258 + if (configModel.getStart() <= month && month <= configModel.getEnd())
  259 + {
  260 + List<String> contents = model.getResult() == 0 ?configModel.getNormals() : (model.getResult() == 1 ? configModel.getReduces() : configModel.getSerious());
  261 + data.put("contents",contents);
  262 + }
  263 + }
  264 + }
  265 + }
250 266 }
251 267  
252 268 healthChargeFacade.addHealthCharge(hospitalId,8, model.getPatientId(), 1, 1, userId, doctorId, false);
... ... @@ -278,6 +294,11 @@
278 294 boneModel.setModified(new Date());
279 295 BoneService.add(boneModel);
280 296 }
  297 + else
  298 + {
  299 + return new BaseResponse().
  300 + setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有关联数据");
  301 + }
281 302 }
282 303 //儿童骨密度
283 304 else
284 305  
285 306  
... ... @@ -296,11 +317,19 @@
296 317 boneModel.setType(1);
297 318 boneModel.setCreated(new Date());
298 319 boneModel.setModified(new Date());
  320 + if (boneModel.getZvalue() != null)
  321 + {
  322 + Integer result = boneModel.getZvalue() >= -1 ? 0 : (boneModel.getZvalue() <-3 ? 2 : 1);
  323 + boneModel.setResult(result);
  324 + }
299 325 BoneService.add(boneModel);
300 326 }
  327 + else
  328 + {
  329 + new BaseResponse().
  330 + setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有关联数据");
  331 + }
301 332 }
302   -
303   -
304 333 return new BaseResponse().
305 334 setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
306 335 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 6eb2323
... ... @@ -202,11 +202,13 @@
202 202 {
203 203 ResidentsArchiveModel model = modelList.get(0);
204 204 spouseCode = model.getCode() == null ? "" : String.valueOf(model.getCode());
  205 +
  206 + checkupResult.setSpouseName(model.getUsername());
  207 + checkupResult.setSpouseCertificateTypeId(model.getCertificateTypeId());
  208 + checkupResult.setSpouseCertificateNum(model.getCertificateNum());
205 209 }
206 210 }
207   -
208 211 archiveMap.put("spouseCode", spouseCode);
209   -
210 212 }
211 213  
212 214 resultMap.put("archiveResult", archiveMap);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 6eb2323
... ... @@ -4362,7 +4362,7 @@
4362 4362 if (models != null && models.size() > 0) {
4363 4363 BabyModel model = models.get(0);
4364 4364  
4365   -
  4365 + result.setNumberCode(model.getNumberCode());
4366 4366 String weakSonsInfo = basicConfigFacade.queryBaseInfoByStr(model.getWeakSonInfo());
4367 4367 result.setWeakSonInfo(weakSonsInfo);
4368 4368 String highRiskInfos = basicConfigFacade.queryBaseInfoByStr(model.getHighRiskInfo());
... ... @@ -4463,6 +4463,8 @@
4463 4463  
4464 4464 /** 优惠券编号 */
4465 4465 result.setCouponCode(couponService.findByUsedId(id));
  4466 +
  4467 +
4466 4468  
4467 4469 BaseObjectResponse objectResponse = new BaseObjectResponse();
4468 4470 objectResponse.setData(result);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java View file @ 6eb2323
... ... @@ -259,6 +259,16 @@
259 259 //居住类别
260 260 private String liveType;
261 261  
  262 + private String numberCode;
  263 +
  264 + public String getNumberCode() {
  265 + return numberCode;
  266 + }
  267 +
  268 + public void setNumberCode(String numberCode) {
  269 + this.numberCode = numberCode;
  270 + }
  271 +
262 272 public String getLiveType() {
263 273 return liveType;
264 274 }
platform-transfer/src/main/java/com/lyms/platform/worker/BoneWorker.java View file @ 6eb2323
... ... @@ -6,6 +6,7 @@
6 6 import com.lyms.platform.conn.BoneConnectionFactory;
7 7 import com.lyms.platform.conn.inf.ConnectionFactoryMethod;
8 8 import com.lyms.platform.conn.inf.IConnection;
  9 +import org.apache.commons.httpclient.util.DateUtil;
9 10 import org.springframework.beans.factory.annotation.Autowired;
10 11 import org.springframework.scheduling.annotation.Scheduled;
11 12 import org.springframework.stereotype.Component;
... ... @@ -14,6 +15,7 @@
14 15 import java.sql.ResultSet;
15 16 import java.sql.SQLException;
16 17 import java.sql.Statement;
  18 +import java.util.Date;
17 19 import java.util.HashMap;
18 20 import java.util.Map;
19 21  
20 22  
21 23  
... ... @@ -39,15 +41,17 @@
39 41  
40 42 conn = iConnection.getConnection();
41 43 sta = conn.createStatement();
42   - rst = sta.executeQuery("select PatientID,ZScore,TScore,dbSos,dbBqi,dbRrf,dbEoa,YoungAdult,ageMatched,dbAge from PatientInfo where status is null");
  44 + rst = sta.executeQuery("select PatientID,ZScore,TScore,dbSos,dbBqi,dbRrf,dbEoa,YoungAdult,ageMatched,dbAge,PartDisplayName from PatientInfo where status is null and DayTimeOfSave > #"+ DateUtil.formatDate(new Date(),"yyyy-MM-dd")+"#");
43 45 while (rst.next()) {
44 46 Map map = new HashMap();
45 47  
46 48 String PatientID = rst.getString("PatientID"); //身份证后八位
47 49 //String position = rst.getString("");
48 50 map.put("cardNo",PatientID);
49   - map.put("position","左侧桡骨远端1/3处");
50 51  
  52 + String PartDisplayName = rst.getString("PartDisplayName");
  53 + map.put("position",PartDisplayName);
  54 +
51 55 String ZScore = rst.getString("ZScore");
52 56 String TScore = rst.getString("TScore");
53 57 String dbSos = rst.getString("dbSos");
... ... @@ -71,6 +75,7 @@
71 75 map.put("adultPercent",adultPercent);
72 76 map.put("agePercent",agePercent);
73 77 map.put("age",age);
  78 + map.put("type",1); //
74 79  
75 80 if (map.size() > 0 && PatientID != null)
76 81 {
platform-transfer/src/main/java/com/lyms/platform/worker/MicroelementWorker.java View file @ 6eb2323
... ... @@ -29,7 +29,7 @@
29 29 @Autowired
30 30 private ApplicationProperties properties;
31 31  
32   - @Scheduled(cron = "0 0/2 * * * ?")
  32 + @Scheduled(cron = "0 0/1 * * * ?")
33 33 public void getMicroelementRecords()
34 34 {
35 35 System.out.println("getMicroelementRecords start");
platform-transfer/src/main/resources/application.yml View file @ 6eb2323
... ... @@ -4,9 +4,9 @@
4 4  
5 5 param:
6 6 #微量元素access路径
7   - microelement-path: D://EK-8800181001-net_Plus//System//Patient.mdb
  7 + microelement-path: D://tc.mdb
8 8 #骨密度access数据库路径
9   - bone-path: D://tc.mdb
  9 + bone-path: D://EK-8800181001-net_Plus//System//Patient.mdb
10 10 #区域url地址
11 11 url: https://dev-rp-api.healthbaby.com.cn
12 12 type: 0 # 0孕妇 1儿童