Commit 831eec37abc3dc1e21e0f95d7e92efd7371453e5
1 parent
d794827571
Exists in
master
and in
6 other branches
肌萎缩
Showing 3 changed files with 29 additions and 14 deletions
platform-dal/src/main/java/com/lyms/platform/pojo/CancerExamineModel.java
View file @
831eec3
| ... | ... | @@ -15,9 +15,16 @@ |
| 15 | 15 | |
| 16 | 16 | private Integer year; //上报年份 |
| 17 | 17 | private Integer quarter; //季度 |
| 18 | - private String optUser; //录入用户 | |
| 18 | + | |
| 19 | + private Integer yearQuarter; | |
| 20 | + | |
| 21 | + private String inHospital;//填报单位 | |
| 22 | + private String inUser;//填报人 | |
| 23 | + private Date inDate;//填报日期 | |
| 19 | 24 | private String optHospital; //录入单位 |
| 25 | + private String optUser; //录入用户 | |
| 20 | 26 | private Date optDate; //录入时间 |
| 27 | + | |
| 21 | 28 | private Integer type;//1 宫颈癌 2 乳腺癌 |
| 22 | 29 | |
| 23 | 30 | private Date examineDate;//审核时间/驳回时间 |
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java
View file @
831eec3
| ... | ... | @@ -721,6 +721,12 @@ |
| 721 | 721 | if (CollectionUtils.isNotEmpty(premaritalCheckupList)) |
| 722 | 722 | { |
| 723 | 723 | for (PremaritalCheckup premaritalCheckup : premaritalCheckupList) { |
| 724 | + | |
| 725 | + if (StringUtils.isEmpty(premaritalCheckup.getCertificateNum())) | |
| 726 | + { | |
| 727 | + continue; | |
| 728 | + } | |
| 729 | + | |
| 724 | 730 | // premaritalCheckup.setLhHiv("2"); |
| 725 | 731 | //获取lis检查数据 |
| 726 | 732 | List<LisReportModel> lisReportModels = getLhxfyLis(premaritalCheckup.getCertificateNum()); |
| ... | ... | @@ -779,17 +785,17 @@ |
| 779 | 785 | case "001D-BIL": |
| 780 | 786 | premaritalCheckup.setDbil(result); |
| 781 | 787 | break; |
| 782 | - /***尿常规检查***/ | |
| 783 | - case "GLU02": | |
| 784 | - if(result.equals("- 0")) | |
| 785 | - { | |
| 786 | - premaritalCheckup.setGlu("阴性"); | |
| 787 | - } | |
| 788 | - else | |
| 789 | - { | |
| 790 | - premaritalCheckup.setGlu("阳性"); | |
| 791 | - } | |
| 792 | - break; | |
| 788 | +// /***尿常规检查***/ | |
| 789 | +// case "GLU02": | |
| 790 | +// if(result.equals("- 0")) | |
| 791 | +// { | |
| 792 | +// premaritalCheckup.setGlu("阴性"); | |
| 793 | +// } | |
| 794 | +// else | |
| 795 | +// { | |
| 796 | +// premaritalCheckup.setGlu("阳性"); | |
| 797 | +// } | |
| 798 | +// break; | |
| 793 | 799 | /***血型***/ |
| 794 | 800 | case "RH": |
| 795 | 801 | if(result.contains("阳性")) { |
| 796 | 802 | |
| ... | ... | @@ -921,11 +927,13 @@ |
| 921 | 927 | premaritalCheckup.setLhHiv("2"); |
| 922 | 928 | /***乙肝表面抗原***/ |
| 923 | 929 | premaritalCheckup.setHbsag("2"); |
| 924 | - | |
| 930 | + //尿常规 | |
| 931 | + premaritalCheckup.setGlu("阴性"); | |
| 925 | 932 | //检查结果更新到个人档案 |
| 926 | 933 | Query query2 = Query.query(Criteria.where("id").is(premaritalCheckup.getId())); |
| 927 | 934 | Update update2 = MongoConvertHelper |
| 928 | 935 | .convertToNativeUpdate(ReflectionUtils.getUpdateField(premaritalCheckup)); |
| 936 | + System.out.println(premaritalCheckup.getId()); | |
| 929 | 937 | mongoTemplate.updateFirst(query2, update2, PremaritalCheckup.class); |
| 930 | 938 | } |
| 931 | 939 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
View file @
831eec3
| ... | ... | @@ -87,7 +87,7 @@ |
| 87 | 87 | Integer userId = loginState.getId(); |
| 88 | 88 | String hospitalId = autoMatchFacade.getHospitalId(userId); |
| 89 | 89 | |
| 90 | - if (request != null && !StringUtils.isEmpty(request.getId()) && ((request.getDataStatus() != null && !"1".equals(request.getDataStatus().toString())) || hospitalId.equals(request.getDeliverOrg()))) { | |
| 90 | + if (request != null && !StringUtils.isEmpty(request.getId()) && ((request.getDataStatus() != null && !"1".equals(request.getDataStatus().toString())))) { | |
| 91 | 91 | return babyBookbuildingFacade.updateBabyBookbuilding(request, userId); |
| 92 | 92 | } |
| 93 | 93 | return babyBookbuildingFacade.addBabyBookbuilding(request, loginState.getId()); |