jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 2aeef2e9f2490017287f8ab6be65f740d0fa90fb

Authored by gengxiaokai
1 parent ecaa363e37
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge branch 'master' of D:\platform\regional-platform with conflicts.

Showing 2 changed files with 10 additions and 15 deletions

.idea/artifacts/platform_sync_data_war_exploded.xml View file @ 2aeef2e
... ... @@ -112,7 +112,7 @@
112 112 </element>
113 113 </element>
114 114 <element id="directory" name="META-INF">
115   - <element id="file-copy" path="$PROJECT_DIR$/platform-sync-data/target/platform-sync-data/META-INF/MANIFEST.MF" />
  115 + <element id="file-copy" path="$PROJECT_DIR$/platform-sync-data/target/MANIFEST.MF" />
116 116 </element>
117 117 <element id="javaee-facet-resources" facet="platform-sync-data/web/Web" />
118 118 </root>
platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyFmService.java View file @ 2aeef2e
... ... @@ -65,7 +65,7 @@
65 65  
66 66 private static Map<String, List> babyMap = new HashMap<>();
67 67  
68   - private static final String HOSPITALID = "1000000114";
  68 + private static final String HOSPITALID = PropertiesUtils.getPropertyValue("hospitalId");
69 69 static {
70 70 ONE_ENUMS.put(0, "长");
71 71 ONE_ENUMS.put(1, "次");
... ... @@ -136,6 +136,7 @@
136 136 " BABY_ASPHYXIAM as BABY_ASPHYXIAM,\n" +
137 137 " BABY_WEIGHT as BABY_WEIGHT,\n" +
138 138 " BABY_HEIGHT as BABY_HEIGHT,\n" +
  139 + " BABY_DEFORMITY as BABY_DEFORMITY,\n" +
139 140 " BABY_APGAR_SCORE_ONE as BABY_APGAR_SCORE_ONE,\n" +
140 141 " BABY_APGAR_SCORE_FIVE as BABY_APGAR_SCORE_FIVE,\n" +
141 142 " BABY_APGAR_SCORE_TEN as BABY_APGAR_SCORE_TEN,\n" +
... ... @@ -160,8 +161,8 @@
160 161 SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
161 162 try {
162 163  
163   - String sql ="select "+cloumns+" from zlhis.v_deliveryinfo where BABY_DELIVERY_TIME > to_date('"+start+"', 'yyyy-MM-dd hh24:mi:ss') " +
164   - " and BABY_DELIVERY_TIME <= to_date('"+end+"', 'yyyy-MM-dd hh24:mi:ss')" ;
  164 + String sql ="select ID as ID from zlhis.v_deliveryinfo where " +
  165 + " to_date(BABY_DELIVERY_TIME,'yyyy-mm-dd hh24:mm:ss') > to_date('"+start+"', 'yyyy-mm-dd hh24:mm:ss') and to_date(BABY_DELIVERY_TIME,'yyyy-mm-dd hh24:mm:ss') <= to_date('"+end+"', 'yyyy-mm-dd hh24:mm:ss')" ;
165 166 if (phone != null)
166 167 {
167 168 sql+=" and phone = '"+phone+"'";
168 169  
169 170  
170 171  
... ... @@ -176,26 +177,20 @@
176 177 int a = 0;//用来判断是否建了儿童档案，如果建了儿童档案就不保存分娩记录
177 178 int count = 0;
178 179 List<Users> users = new ArrayList<Users>();
179   -// String id = fm.getID();//获取所有的孕妇ID，方便孕妇产下双胞胎而用
180   -// String allSql = "select "+cloumns+" from zlhis.v_deliveryinfo where ID='"+id+"'" ;
  180 + String id = fm.getID();//获取所有的孕妇ID，方便孕妇产下双胞胎而用
  181 + String allSql = "select "+cloumns+" from zlhis.v_deliveryinfo where " +
  182 + " to_date(BABY_DELIVERY_TIME,'yyyy-mm-dd hh24:mm:ss') > to_date('"+start+"', 'yyyy-mm-dd hh24:mm:ss') and to_date(BABY_DELIVERY_TIME,'yyyy-mm-dd hh24:mm:ss') <= to_date('"+end+"', 'yyyy-mm-dd hh24:mm:ss')" +
  183 + " and ID='"+id+"'" ;
181 184  
182 185 //查出这个ID对应孕妇在这个时间段的分娩记录
183   -// List<Fm> allList = queryRunner.query(conn, allSql, new BeanListHandler<Fm>(Fm.class));
  186 + List<Fm> allList = queryRunner.query(conn, allSql, new BeanListHandler<Fm>(Fm.class));
184 187  
185   - List<Fm> allList = new ArrayList<>();
186   - allList.add(fm);
187   -
188 188 Date dueDate = null;
189 189 List<MatDeliverAddRequest.Baby> babies = new ArrayList<>();
190 190 MatDeliverAddRequest deliverAddRequest = new MatDeliverAddRequest();
191 191 for(Fm allFm:allList){
192 192  
193 193 if ("死胎".equals(allFm.getBABY_PREGNANCY_OUT()))
194   - {
195   - continue;
196   - }
197   -
198   - if (StringUtils.isEmpty(allFm.getPHONE()) || StringUtils.isEmpty(allFm.getIDCARD()))
199 194 {
200 195 continue;
201 196 }