Commit c049eaa76574c5155ca5399756c4f097b7b9bacf
1 parent
73692a54c5
Exists in
master
and in
6 other branches
年报bug修改围产儿情况
Showing 2 changed files with 48 additions and 0 deletions
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
View file @
c049eaa
| ... | ... | @@ -192,7 +192,17 @@ |
| 192 | 192 | //用来配合查询新筛实验室列表数据 |
| 193 | 193 | private List sieveStatusList2; |
| 194 | 194 | |
| 195 | + private Integer dueWeek; | |
| 195 | 196 | |
| 197 | + | |
| 198 | + public Integer getDueWeek() { | |
| 199 | + return dueWeek; | |
| 200 | + } | |
| 201 | + | |
| 202 | + public void setDueWeek(Integer dueWeek) { | |
| 203 | + this.dueWeek = dueWeek; | |
| 204 | + } | |
| 205 | + | |
| 196 | 206 | public List getSieveStatusList2() { |
| 197 | 207 | return sieveStatusList2; |
| 198 | 208 | } |
| ... | ... | @@ -775,6 +785,12 @@ |
| 775 | 785 | @Override |
| 776 | 786 | public MongoQuery convertToQuery() { |
| 777 | 787 | MongoCondition condition = MongoCondition.newInstance(); |
| 788 | + | |
| 789 | + | |
| 790 | + if (null != dueWeek) { | |
| 791 | + condition = condition.and("dueWeek", dueWeek, MongoOper.LTE); | |
| 792 | + } | |
| 793 | + | |
| 778 | 794 | |
| 779 | 795 | if (-1 != visitstatus) { |
| 780 | 796 | condition = condition.and("visitstatus", visitstatus, MongoOper.IS); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AnnualReportFacade.java
View file @
c049eaa
| ... | ... | @@ -17,6 +17,7 @@ |
| 17 | 17 | import com.lyms.platform.permission.service.OrganizationService; |
| 18 | 18 | import com.lyms.platform.pojo.*; |
| 19 | 19 | import com.lyms.platform.query.*; |
| 20 | +import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer; | |
| 20 | 21 | import org.apache.commons.collections.CollectionUtils; |
| 21 | 22 | import org.springframework.beans.factory.annotation.Autowired; |
| 22 | 23 | import org.springframework.beans.factory.annotation.Qualifier; |
| ... | ... | @@ -794,6 +795,9 @@ |
| 794 | 795 | BabyModelQuery babyModelQuery6 = new BabyModelQuery(); |
| 795 | 796 | babyModelQuery6.setDataStatus(false); |
| 796 | 797 | babyModelQuery6.setHospitalIdList(entry.getValue()); |
| 798 | + // babyModelQuery6.setHospitalId("216"); | |
| 799 | + babyModelQuery6.setBuildType(2); | |
| 800 | + babyModelQuery6.setPregnancyOut("0"); | |
| 797 | 801 | if (StringUtils.isNotEmpty(time)) { |
| 798 | 802 | babyModelQuery6.setBirthStart(DateUtil.getSNDate(time)[0]); |
| 799 | 803 | babyModelQuery6.setBirthEnd(DateUtil.addDay(DateUtil.getSNDate(time)[1], 1)); |
| 800 | 804 | |
| ... | ... | @@ -801,7 +805,12 @@ |
| 801 | 805 | babyModelQuery6.setBabyWeightStart("0"); |
| 802 | 806 | babyModelQuery6.setBabyWeightEnd("2.49"); |
| 803 | 807 | |
| 808 | + | |
| 804 | 809 | int lowWeightCount = babyService.queryBabyCount(babyModelQuery6); |
| 810 | + /* System.out.println("============" + lowWeightCount); | |
| 811 | + String mongosqlS = babyModelQuery6.convertToQuery().convertToMongoQuery().toString(); | |
| 812 | + System.out.println("mongosql=" + mongosqlS);*/ | |
| 813 | + | |
| 805 | 814 | //低出生体重数 |
| 806 | 815 | map.put("lowWeightCount", String.valueOf(lowWeightCount)); |
| 807 | 816 | |
| ... | ... | @@ -809,6 +818,8 @@ |
| 809 | 818 | BabyModelQuery babyModelQuery5 = new BabyModelQuery(); |
| 810 | 819 | babyModelQuery5.setDataStatus(false); |
| 811 | 820 | babyModelQuery5.setHospitalIdList(entry.getValue()); |
| 821 | + babyModelQuery5.setBuildType(2); | |
| 822 | + babyModelQuery5.setPregnancyOut("0"); | |
| 812 | 823 | if (StringUtils.isNotEmpty(time)) { |
| 813 | 824 | babyModelQuery5.setBirthStart(DateUtil.getSNDate(time)[0]); |
| 814 | 825 | babyModelQuery5.setBirthEnd(DateUtil.addDay(DateUtil.getSNDate(time)[1], 1)); |
| ... | ... | @@ -816,6 +827,7 @@ |
| 816 | 827 | babyModelQuery5.setBabyWeightStart("4"); |
| 817 | 828 | int bigBoyCount = babyService.queryBabyCount(babyModelQuery5); |
| 818 | 829 | |
| 830 | + | |
| 819 | 831 | //巨大儿数 |
| 820 | 832 | map.put("bigBoyCount", String.valueOf(bigBoyCount)); |
| 821 | 833 | map.put("bigBoyPervent", this.division(bigBoyCount, huoChanCount)); |
| ... | ... | @@ -859,6 +871,26 @@ |
| 859 | 871 | //早产儿 |
| 860 | 872 | map.put("zcBabyCount", String.valueOf(zcBabyCount)); |
| 861 | 873 | map.put("zcBabyPervent", this.division(zcBabyCount, huoChanCount)); |
| 874 | + | |
| 875 | + | |
| 876 | + /* //秦皇岛 | |
| 877 | + BabyModelQuery babyModelQuery9 = new BabyModelQuery(); | |
| 878 | + babyModelQuery9.setYn(YnEnums.YES.getId()); | |
| 879 | + babyModelQuery9.setHospitalId("216"); | |
| 880 | + babyModelQuery9.setPregnancyOut("0"); | |
| 881 | + babyModelQuery9.setBuildType(2); | |
| 882 | + babyModelQuery9.setDueWeek(36); | |
| 883 | + if (StringUtils.isNotEmpty(time)) { | |
| 884 | + babyModelQuery9.setBirthStart(DateUtil.getSNDate(time)[0]); | |
| 885 | + babyModelQuery9.setBirthEnd(DateUtil.addDay(DateUtil.getSNDate(time)[1], 1)); | |
| 886 | + } | |
| 887 | + System.out.println("=========>" + lowWeightCount); | |
| 888 | + int bigBoyCountS = babyService.queryBabyCount(babyModelQuery9); | |
| 889 | + System.out.println("============" + bigBoyCountS); | |
| 890 | + String mongosqlS = babyModelQuery9.convertToQuery().convertToMongoQuery().toString(); | |
| 891 | + System.out.println("mongosql=" + mongosqlS);*/ | |
| 892 | + | |
| 893 | + | |
| 862 | 894 | MatDeliverQuery matDeliverQuery10 = new MatDeliverQuery(); |
| 863 | 895 | matDeliverQuery10.setYn(YnEnums.YES.getId()); |
| 864 | 896 | if (StringUtils.isNotEmpty(time)) { |