Commit d4f9c345889892ad044f64be99b6f0f5c1a1f034
1 parent
68c9a83318
Exists in
master
and in
6 other branches
衡水导出
Showing 1 changed file with 11 additions and 10 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
View file @
d4f9c34
| ... | ... | @@ -180,16 +180,6 @@ |
| 180 | 180 | BaseListResponse baseListResponse; |
| 181 | 181 | childbirthManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId()); |
| 182 | 182 | String hospitalId = autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId()); |
| 183 | - | |
| 184 | - String hsColum = "vcCardNo,name,cardNo,phone,husbandName,husbandCardNo,husbandPhone,pliveTypeId,pcensusTypeId,registerAddress,address,postAddress,dueDate,fileCode,chBpSsy1,chBpSzy1,dueWeek,fetalPosition,heartRate,fetalPresentation,perinealCondition,deliveryMode,breath,needleNum,pulse,prodprocessOne,prodprocessTwo,prodprocessThree,totalprocess,ohloseBloodL,thloseBloodL,rhloseBloodL,loseBloodCause,tpmcType,tpSize,tpWeight,umbilicalCordLength,umbilicalCordEx,umbilicalCordExType,tireNumber,maternalInfo,operationCause,fmHospital,deliverDoctor,sex,babyWeight,babyHeight,apgarScorePf1,apgarScorePf5,apgarScorePf10,pregnancyOut,asphyxiaM,deathCause,babyHealthy,malformation"; | |
| 185 | - | |
| 186 | - Organization o = organizationService.getOrganization(Integer.parseInt(hospitalId)); | |
| 187 | - if (o != null && "12".equals(o.getCityId())) | |
| 188 | - { | |
| 189 | - childbirthManagerRequest.setInitQuery(hsColum); | |
| 190 | - childbirthManagerRequest.setInitQueryMap(childbirthManagerRequest.getInitQueryMapHs()); | |
| 191 | - } | |
| 192 | - | |
| 193 | 183 | try { |
| 194 | 184 | Map<String, String> query; |
| 195 | 185 | if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())) { |
| ... | ... | @@ -258,6 +248,17 @@ |
| 258 | 248 | public void childbirthManagerExcel(HttpServletRequest httpServletRequest, @RequestBody ChildbirthManagerRequest childbirthManagerRequest, HttpServletResponse httpServletResponse) { |
| 259 | 249 | try { |
| 260 | 250 | childbirthManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId()); |
| 251 | + | |
| 252 | + String hospitalId = autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId()); | |
| 253 | + | |
| 254 | + String hsColum = "vcCardNo,name,cardNo,phone,husbandName,husbandCardNo,husbandPhone,pliveTypeId,pcensusTypeId,registerAddress,address,postAddress,dueDate,fileCode,chBpSsy1,chBpSzy1,dueWeek,fetalPosition,heartRate,fetalPresentation,perinealCondition,deliveryMode,breath,needleNum,pulse,prodprocessOne,prodprocessTwo,prodprocessThree,totalprocess,ohloseBloodL,thloseBloodL,rhloseBloodL,loseBloodCause,tpmcType,tpSize,tpWeight,umbilicalCordLength,umbilicalCordEx,umbilicalCordExType,tireNumber,maternalInfo,operationCause,fmHospital,deliverDoctor,sex,babyWeight,babyHeight,apgarScorePf1,apgarScorePf5,apgarScorePf10,pregnancyOut,asphyxiaM,deathCause,babyHealthy,malformation"; | |
| 255 | + | |
| 256 | + Organization o = organizationService.getOrganization(Integer.parseInt(hospitalId)); | |
| 257 | + if (o != null && "12".equals(o.getCityId())) | |
| 258 | + { | |
| 259 | + childbirthManagerRequest.setInitQuery(hsColum); | |
| 260 | + childbirthManagerRequest.setInitQueryMap(childbirthManagerRequest.getInitQueryMapHs()); | |
| 261 | + } | |
| 261 | 262 | |
| 262 | 263 | Map<String, String> query; |
| 263 | 264 | if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())) { |