jiangjiazhi / regional-platform

Download as
Browse Code »

Commit e1d0f9aead821d24bac28f101ccbcda709a87787

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

听力诊断模块

Showing 5 changed files with 136 additions and 88 deletions

platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml View file @ e1d0f9a
... ... @@ -296,7 +296,7 @@
296 296 <select id="queryBabyPatientExtendEarScreen" resultMap="BabyPatientExtendEarScreenResultMap"
297 297 parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarScreenQuery">
298 298 select
299   - id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,last_update_date,next_check_time,last_update_user_id,last_update_hospital_id,status,scr_ispass,pid
  299 + id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,rrna_1494,rrna_1555,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,last_update_date,next_check_time,last_update_user_id,last_update_hospital_id,status,scr_ispass,pid
300 300 from baby_patient_extend_ear_screen
301 301 <include refid="BabyPatientExtendEarScreenCondition"/>
302 302 <include refid="orderAndLimit"/>
... ... @@ -305,7 +305,7 @@
305 305 <select id="queryEarScreenList" resultMap="BabyPatientExtendEarScreenResultMap"
306 306 parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarScreenQuery">
307 307 select
308   - id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,last_update_date,next_check_time,last_update_user_id,last_update_hospital_id,status,scr_ispass,pid
  308 + id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,rrna_1494,rrna_1555,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,last_update_date,next_check_time,last_update_user_id,last_update_hospital_id,status,scr_ispass,pid
309 309 from baby_patient_extend_ear_screen
310 310 <where>
311 311 status = 0
... ... @@ -638,6 +638,7 @@
638 638 resultType="String">
639 639 select DISTINCT baby_id from baby_patient_extend_ear_screen sc
640 640 <where>
  641 + 1=1
641 642 <if test="checkHospitalIds!=null">
642 643 and sc.check_hospital_id in (
643 644 <foreach item="hsId" collection="checkHospitalIds" separator=",">
... ... @@ -645,6 +646,9 @@
645 646 </foreach>
646 647 )
647 648 </if>
  649 + <if test="checkHospitalId != null and checkHospitalId != ''">
  650 + and check_hospital_id = #{checkHospitalId,jdbcType=VARCHAR}
  651 + </if>
648 652  
649 653 <if test="babyIds!=null">
650 654 and sc.baby_id in (
... ... @@ -653,11 +657,9 @@
653 657 </foreach>
654 658 )
655 659 </if>
656   - and
657   - screen_type = 2
658   - and
659   - scr_ispass = 2
660   - ORDER BY sc.create_date DESC
  660 + and scr_ispass = 2
  661 + and screen_type = 2
  662 +
661 663 </where>
662 664 </select>
663 665 </mapper>
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java View file @ e1d0f9a
... ... @@ -114,6 +114,7 @@
114 114 //查询听诊记录
115 115 BabyPatientExtendEarHearingDiagnoseQuery hdQuery = new BabyPatientExtendEarHearingDiagnoseQuery();
116 116 hdQuery.setBabyIds((String[]) babyIds.toArray(new String[babyIds.size()]));
  117 + hdQuery.setSort("diagnose_time");
117 118 List<BabyPatientExtendEarHearingDiagnose> hdList = hearingDiagnoseService.queryBabyPatientExtendEarHearingDiagnose(hdQuery);
118 119  
119 120 if (hdList == null && hdList.size() == 0) {
... ... @@ -147,6 +148,11 @@
147 148 if (!isConfirm) {// //若没有听诊记录或所有听诊记录都未确诊。提示：该儿童还未听力确诊，不能进行随访。
148 149 return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("当前儿童听诊记录还未有确诊记录不能进行随访");
149 150 }
  151 +
  152 + //最后一次听诊时间
  153 + BabyPatientExtendEarHearingDiagnose ehd = hdList.get(hdList.size()-1);
  154 + String diagnoseDate = DateUtil.getyyyy_MM_dd(ehd.getDiagnoseTime());
  155 + initHearingDiagnose.setDiagnoseDate(diagnoseDate);
150 156 //根据条件查询基础配置信息表
151 157 return initHearingDiagnose.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功");
152 158 }
... ... @@ -183,7 +189,6 @@
183 189 return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录");
184 190 }
185 191  
186   -
187 192 if (StringUtils.isEmpty(babyId)) {//传入儿童档案id
188 193 return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入儿童档案id");
189 194 }
... ... @@ -207,7 +212,14 @@
207 212 return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("当前儿童还未完善听力建档");
208 213 }
209 214  
210   - return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功");
  215 + //第一次
  216 + BabyModel babyModel = babyService.getOneBabyById(babyId);
  217 + String buildDate = DateUtil.getyyyy_MM_dd(babyModel.getBuildDate());
  218 + Map<String,String> data = new HashMap<>();
  219 + BaseResponse resObj = new BaseResponse();
  220 + data.put("buildDate",buildDate);
  221 + resObj.setObject(data);
  222 + return resObj.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功");
211 223 }
212 224  
213 225 /**
214 226  
... ... @@ -309,9 +321,13 @@
309 321 babyIds.add(es.getBabyPatientId());
310 322 }
311 323  
  324 + query.setSort("screen_date");
  325 +
312 326 query.setBabyIds((String[]) babyIds.toArray(new String[babyIds.size()]));
313 327 // d、本院：初筛未通过或复筛确诊
314 328 List<BabyPatientExtendEarScreen> screenList = screenService.queryBabyPatientExtendEarScreen(query);
  329 + //最后一次听筛时间
  330 + Map<String,String> data = new HashMap<>();
315 331 if (screenList == null || screenList.size() == 0) {//没有听筛记录，查询转诊记录
316 332 //查询听力转诊申请 // e、外院：有申请记录则允许进行新增听力筛查
317 333 HighriskChangeHospitalQuery hcQuery = new HighriskChangeHospitalQuery();
318 334  
319 335  
320 336  
... ... @@ -324,25 +340,20 @@
324 340 } else {
325 341 boolean isResu = false;
326 342 for (BabyPatientExtendEarScreen scr : screenList) {
327   - if (scr.getScrIspass() == 2) {//是复筛并且未通过
  343 + if (scr.getScrIspass() == 2) {//未通过
328 344 isResu = true;
329   - break;
330 345 }
331 346 }
332 347 if (!isResu) {
333 348 return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("当前儿童听筛已通过，不能进行听力诊断");
334 349 }
  350 + BabyPatientExtendEarScreen earScreen = screenList.get(screenList.size()-1);
  351 + String screenDate = DateUtil.getyyyy_MM_dd(earScreen.getScreenDate());
  352 + data.put("screenDate",screenDate);
335 353 }
336   -
337   - //根据条件查询基础配置信息表
338   - InitHearingDiagnose initHearingDiagnose = new InitHearingDiagnose();
339   - // initHearingDiagnose.setConfirmResult(EnumUtil.toJson(ConfirmedEnums.class));
340   - //
341   - // initHearingDiagnose.setHearingDiagnosis(EnumUtil.toJson(HearingDiagnosisEnums.class));
342   - //
343   - // initHearingDiagnose.setHighRiskConfirms(EnumUtil.toJson(HighRiskEnum.class));
344   -
345   - return initHearingDiagnose.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功");
  354 + BaseResponse resObj = new BaseResponse();
  355 + resObj.setObject(data);
  356 + return resObj.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功");
346 357 }
347 358  
348 359 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java View file @ e1d0f9a
... ... @@ -369,12 +369,17 @@
369 369 }
370 370 }
371 371  
  372 +
  373 +
  374 + BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery();
  375 +
  376 +
372 377 BabyPatientExtendEarScreenQuery scrQuery = new BabyPatientExtendEarScreenQuery();
373 378 //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id
374 379 if (StringUtils.isNotEmpty(hdReq.getKeyWord())) {//关键字：姓名、联系方式、就诊卡 查询babyId
375 380 BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery();
376 381 babyQuery.setQueryNo(hdReq.getKeyWord());
377   - babyQuery.setHospitalId(hospitalId);
  382 + // babyQuery.setHospitalId(hospitalId);
378 383 List<BabyPatientExtendEarBaby> models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery);
379 384 if (CollectionUtils.isNotEmpty(models)) {
380 385 List<String> babyIds = new ArrayList<>();
381 386  
382 387  
... ... @@ -382,15 +387,16 @@
382 387 babyIds.add(babyModel.getBabyPatientId());
383 388 }
384 389 scrQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()]));
  390 + query.setBabyIds(babyIds.toArray(new String[babyIds.size()]));
385 391 } else {
386 392 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据");
387 393 }
388 394 }
389 395  
390   - //本院听筛数据
  396 + scrQuery.setCreateHospitalId(hospitalId);
  397 + //本院听筛数据 复筛未通过-待诊断
391 398 List<String> babyIds = screenService.queryScrBabyIds(scrQuery);
392 399  
393   - BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery();
394 400 if(CollectionUtils.isNotEmpty(pids)){
395 401 query.setPids((String[]) pids.toArray(new String[pids.size()]));
396 402 }
... ... @@ -601,6 +607,7 @@
601 607 hea.setBirthday(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(babyModel.getBirth())));
602 608 hea.setSex(com.lyms.platform.common.utils.StringUtils.emptyDeal(SexEnum.getTextById(babyModel.getSex())));
603 609 }
  610 + hea.setDiagnResult("待诊断");
604 611 //全部
605 612 hdrList.add(hea);
606 613 //待诊断
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java View file @ e1d0f9a
... ... @@ -172,6 +172,7 @@
172 172  
173 173 /**
174 174 * 根据babyid和医院Id获取babyIds
  175 + *
175 176 * @param babyId
176 177 * @param hospitalId
177 178 * @return
... ... @@ -196,7 +197,7 @@
196 197  
197 198 List<BabyPatientExtendEar> babyPatientExtendEars1 = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery);
198 199 if (CollectionUtils.isNotEmpty(babyPatientExtendEars1)) {
199   - for(BabyPatientExtendEar ear:babyPatientExtendEars1){
  200 + for (BabyPatientExtendEar ear : babyPatientExtendEars1) {
200 201 babyIds.add(ear.getBabyPatientId());
201 202 }
202 203 }
... ... @@ -210,7 +211,7 @@
210 211 * @param babyId 儿童档案Id
211 212 * @return 操作是否成功
212 213 */
213   - public boolean showBabyEar(String babyId,String hospitalId) {
  214 + public boolean showBabyEar(String babyId, String hospitalId) {
214 215 if (StringUtils.isEmpty(babyId)) {
215 216 return false;
216 217 }
... ... @@ -222,7 +223,7 @@
222 223 babyQuery.setEnable("0");
223 224 babyQuery.setHospitalId(hospitalId);
224 225 List<BabyModel> babyModels = babyService.queryBabyWithQuery(babyQuery);
225   - if(CollectionUtils.isNotEmpty(babyModels)){
  226 + if (CollectionUtils.isNotEmpty(babyModels)) {
226 227 babyModel = babyModels.get(0);
227 228 }
228 229  
... ... @@ -240,7 +241,7 @@
240 241  
241 242 List<BabyPatientExtendEarBaby> babyPatientExtendEarBaby = babyPatientExtendEarBabyService.queryBabyPatientExtendEarBaby(extendEarBabyQuery);
242 243  
243   - if(CollectionUtils.isNotEmpty(babyPatientExtendEarBaby)){
  244 + if (CollectionUtils.isNotEmpty(babyPatientExtendEarBaby)) {
244 245 BabyPatientExtendEarBaby earBaby = babyPatientExtendEarBaby.get(0);
245 246 earBaby.setEnable("1");
246 247 babyPatientExtendEarBabyService.updateBabyPatientExtendEarBaby(earBaby);
... ... @@ -267,7 +268,7 @@
267 268 * @param hospitalId 医院Id
268 269 * @return 操作是否成功
269 270 */
270   - public boolean addhideBabyEar(String babyId, String hospitalId,String enable) {
  271 + public boolean addhideBabyEar(String babyId, String hospitalId, String enable) {
271 272  
272 273 if (StringUtils.isEmpty(babyId) || StringUtils.isEmpty(hospitalId)) {
273 274 return false;
... ... @@ -292,7 +293,7 @@
292 293 //2-隐藏建档 0--转诊
293 294 babyModel.setEnable(enable);
294 295 //隐藏建档需要baby来源id
295   - if(enable.equals("2")){
  296 + if (enable.equals("2")) {
296 297 babyModel.setSource(babyId);
297 298 }
298 299 babyModel.setBuildType(3);
299 300  
... ... @@ -305,8 +306,19 @@
305 306 earQuery.setBabyPatientId(babyId);
306 307 // earQuery.setCreateHospitalId(hospitalId);
307 308 List<BabyPatientExtendEar> ears = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery);
  309 + BabyPatientExtendEar ear = null;
  310 + boolean isPass = false;
308 311 if (CollectionUtils.isNotEmpty(ears)) {
309   - BabyPatientExtendEar ear = ears.get(0);
  312 + for (BabyPatientExtendEar er : ears) {
  313 + if (hospitalId.equals(er.getCreateHospitalId())) {//相同
  314 + isPass = true;
  315 + break;
  316 + } else {
  317 + ear = er;
  318 + }
  319 + }
  320 + }
  321 + if (!isPass) {
310 322 //如果不相同转诊档案
311 323 if (!hospitalId.equals(ear.getCreateHospitalId())) {
312 324 ear.setId(UUID.randomUUID().toString().replace("-", ""));
... ... @@ -315,37 +327,6 @@
315 327 ear.setStatus(YnEnums.NO.getId());
316 328 babyPatientExtendEarService.addBabyPatientExtendEar(ear);
317 329  
318   - BabyPatientExtendEarBabyQuery query = new BabyPatientExtendEarBabyQuery();
319   - query.setBabyPatientId(babyId);
320   - List<BabyPatientExtendEarBaby> babyPatientExtendEarBabies = babyPatientExtendEarBabyService.queryBabyPatientExtendEarBaby(query);
321   - if(CollectionUtils.isNotEmpty(babyPatientExtendEarBabies)){
322   - BabyPatientExtendEarBaby earBaby = babyPatientExtendEarBabies.get(0);
323   - if(!earBaby.getHospitalId().equals(hospitalId)){
324   - BabyPatientExtendEarBaby babyPatientExtendEarBaby = new BabyPatientExtendEarBaby();
325   - babyModel = babyService.getOneBabyById(newBabyId);
326   - babyPatientExtendEarBaby.setId(UUID.randomUUID().toString().replace("-", ""));
327   - babyPatientExtendEarBaby.setName(babyModel.getName());
328   - babyPatientExtendEarBaby.setSex(babyModel.getSex());
329   - babyPatientExtendEarBaby.setCardno(babyModel.getCardNo());
330   - babyPatientExtendEarBaby.setBirth(babyModel.getBirth());
331   - babyPatientExtendEarBaby.setMname(babyModel.getMname());
332   - babyPatientExtendEarBaby.setMcertTypeId(babyModel.getMcertTypeId());
333   - babyPatientExtendEarBaby.setMcertNo(babyModel.getMcertNo());
334   - babyPatientExtendEarBaby.setMphone(babyModel.getMphone());
335   - babyPatientExtendEarBaby.setVcCardNo(babyModel.getVcCardNo());
336   - babyPatientExtendEarBaby.setBuildDoctor(babyModel.getBuildDoctor());
337   - babyPatientExtendEarBaby.setHospitalId(hospitalId);
338   - babyPatientExtendEarBaby.setBuildType(babyModel.getBuildType());
339   - babyPatientExtendEarBaby.setYn(babyModel.getYn());
340   - babyPatientExtendEarBaby.setBuildDate(babyModel.getBuildDate());
341   - babyPatientExtendEarBaby.setEnable(babyModel.getEnable());
342   - babyPatientExtendEarBaby.setBabyPatientId(babyModel.getId());
343   - babyPatientExtendEarBaby.setBabyEarId(ear.getId());
344   - babyPatientExtendEarBaby.setPersonId(babyModel.getPid());
345   - babyPatientExtendEarBabyService.addBabyPatientExtendEarBaby(babyPatientExtendEarBaby);
346   - }
347   - }
348   -
349 330 //儿童基本信息
350 331 BabyPatientExtendEarBirthQuery earBirthQuery = new BabyPatientExtendEarBirthQuery();
351 332 earBirthQuery.setBabyPatientId(babyId);
352 333  
353 334  
... ... @@ -386,10 +367,47 @@
386 367 }
387 368 }
388 369 }
  370 +
  371 + BabyPatientExtendEarBabyQuery query = new BabyPatientExtendEarBabyQuery();
  372 + query.setBabyPatientId(babyId);
  373 + List<BabyPatientExtendEarBaby> babyPatientExtendEarBabies = babyPatientExtendEarBabyService.queryBabyPatientExtendEarBaby(query);
  374 + isPass = false;
  375 + if (CollectionUtils.isNotEmpty(babyPatientExtendEarBabies)) {
  376 + for (BabyPatientExtendEarBaby earBabys : babyPatientExtendEarBabies) {
  377 + if (hospitalId.equals(earBabys.getHospitalId())) {//相同
  378 + isPass = true;
  379 + break;
  380 + }
  381 + }
  382 + }
  383 +
  384 + if (!isPass) {
  385 + BabyPatientExtendEarBaby babyPatientExtendEarBaby = new BabyPatientExtendEarBaby();
  386 + babyModel = babyService.getOneBabyById(newBabyId);
  387 + babyPatientExtendEarBaby.setId(UUID.randomUUID().toString().replace("-", ""));
  388 + babyPatientExtendEarBaby.setName(babyModel.getName());
  389 + babyPatientExtendEarBaby.setSex(babyModel.getSex());
  390 + babyPatientExtendEarBaby.setCardno(babyModel.getCardNo());
  391 + babyPatientExtendEarBaby.setBirth(babyModel.getBirth());
  392 + babyPatientExtendEarBaby.setMname(babyModel.getMname());
  393 + babyPatientExtendEarBaby.setMcertTypeId(babyModel.getMcertTypeId());
  394 + babyPatientExtendEarBaby.setMcertNo(babyModel.getMcertNo());
  395 + babyPatientExtendEarBaby.setMphone(babyModel.getMphone());
  396 + babyPatientExtendEarBaby.setVcCardNo(babyModel.getVcCardNo());
  397 + babyPatientExtendEarBaby.setBuildDoctor(babyModel.getBuildDoctor());
  398 + babyPatientExtendEarBaby.setHospitalId(hospitalId);
  399 + babyPatientExtendEarBaby.setBuildType(babyModel.getBuildType());
  400 + babyPatientExtendEarBaby.setYn(babyModel.getYn());
  401 + babyPatientExtendEarBaby.setBuildDate(babyModel.getBuildDate());
  402 + babyPatientExtendEarBaby.setEnable(babyModel.getEnable());
  403 + babyPatientExtendEarBaby.setBabyPatientId(babyModel.getId());
  404 + babyPatientExtendEarBaby.setBabyEarId(ear.getId());
  405 + babyPatientExtendEarBaby.setPersonId(babyModel.getPid());
  406 + babyPatientExtendEarBabyService.addBabyPatientExtendEarBaby(babyPatientExtendEarBaby);
  407 + }
389 408 return true;
390   - } else {
391   - return false;
392 409 }
  410 + return true;
393 411 }
394 412  
395 413  
... ... @@ -423,7 +441,7 @@
423 441  
424 442 if (null != baby) {
425 443 String pid = null;
426   - if(StringUtils.isNotEmpty(baby.getId())){//修改儿童信息
  444 + if (StringUtils.isNotEmpty(baby.getId())) {//修改儿童信息
427 445 BabyModel babyModel = babyService.getOneBabyById(baby.getId());
428 446 //跟距母親的證件號查詢兒童person信息
429 447 PersonModelQuery personModelQuery = new PersonModelQuery();
430 448  
... ... @@ -436,10 +454,10 @@
436 454 personModel.setPhone(baby.getName());
437 455 personModel.setCardNo(baby.getMcertNo());
438 456 personModel.setModified(new Date());
439   - pid = personModel.getId();
440   - personService.updatePerson(personModel,personModel.getId());
  457 + pid = personModel.getId();
  458 + personService.updatePerson(personModel, personModel.getId());
441 459 }
442   - }else{//新增儿童信息
  460 + } else {//新增儿童信息
443 461 //处理儿童person信息
444 462 pid = handBabyPerson(baby).getId();
445 463 }
... ... @@ -859,7 +877,7 @@
859 877 hfString = historyStr.toString();
860 878 }
861 879 babyEarFamilyView.setBadLifeHistory(hfString);
862   - }else{
  880 + } else {
863 881 babyEarFamilyView.setBadLifeHistory("无");
864 882 }
865 883 }
866 884  
... ... @@ -956,9 +974,9 @@
956 974 hfString = historyStr.toString();
957 975 }
958 976  
959   - if(StringUtils.isNotEmpty(hfString)){
  977 + if (StringUtils.isNotEmpty(hfString)) {
960 978 babyEarMotherView.setViralInfectionHistoryType(hfString);
961   - }else{
  979 + } else {
962 980 babyEarMotherView.setViralInfectionHistoryType("无");
963 981 }
964 982 }
965 983  
... ... @@ -1026,9 +1044,9 @@
1026 1044 hfString = historyStr.toString();
1027 1045 }
1028 1046  
1029   - if(StringUtils.isNotEmpty(hfString)){
  1047 + if (StringUtils.isNotEmpty(hfString)) {
1030 1048 babyEarMotherView.setGenitalInfectionHistoryType(hfString);
1031   - }else{
  1049 + } else {
1032 1050 babyEarMotherView.setGenitalInfectionHistoryType("无");
1033 1051 }
1034 1052 }
... ... @@ -1048,7 +1066,7 @@
1048 1066 } else {
1049 1067 historyStr.append("无");
1050 1068 }
1051   - }else{
  1069 + } else {
1052 1070 historyStr.append("无");
1053 1071 }
1054 1072 babyEarMotherView.setRadiationHistoryType(historyStr.toString());
... ... @@ -1136,7 +1154,7 @@
1136 1154 hfString = historyStr.toString();
1137 1155 }
1138 1156 babyEarMotherView.setBadLifeHistoryType(hfString);
1139   - }else{
  1157 + } else {
1140 1158 babyEarMotherView.setBadLifeHistoryType("无");
1141 1159 }
1142 1160  
... ... @@ -1256,7 +1274,7 @@
1256 1274 */
1257 1275 public BabyEarBirthView convertToBabyEarBirthView(BabyPatientExtendEarBirth babyPatientExtendEarBirth) {
1258 1276 BabyEarBirthView babyEarBirthView = new BabyEarBirthView();
1259   - babyEarBirthView.setFetuNumber(babyPatientExtendEarBirth.getFetuNumber() == null ? "" : "第"+babyPatientExtendEarBirth.getFetuNumber() + "胎");
  1277 + babyEarBirthView.setFetuNumber(babyPatientExtendEarBirth.getFetuNumber() == null ? "" : "第" + babyPatientExtendEarBirth.getFetuNumber() + "胎");
1260 1278 babyEarBirthView.setProductNumber(babyPatientExtendEarBirth.getProductNumber() == null ? "" : babyPatientExtendEarBirth.getProductNumber() + "次");
1261 1279 babyEarBirthView.setBirthWeight(babyPatientExtendEarBirth.getBirthWeight());
1262 1280 babyEarBirthView.setBirthWeight(babyPatientExtendEarBirth.getBirthWeight());
1263 1281  
1264 1282  
1265 1283  
1266 1284  
... ... @@ -1273,26 +1291,26 @@
1273 1291 babyEarBirthView.setAmnioticFluid("III度");
1274 1292 }
1275 1293 }
1276   - if(StringUtils.isNotEmpty(TaiShuEnums.getTitle(babyPatientExtendEarBirth.getTireNumber()))){
  1294 + if (StringUtils.isNotEmpty(TaiShuEnums.getTitle(babyPatientExtendEarBirth.getTireNumber()))) {
1277 1295 babyEarBirthView.setTireNumber(TaiShuEnums.getTitle(babyPatientExtendEarBirth.getTireNumber()));
1278 1296 }
1279 1297 String birthDefectType = "无";
1280   - if(babyPatientExtendEarBirth.getBirthDefectType()!=null){
  1298 + if (babyPatientExtendEarBirth.getBirthDefectType() != null) {
1281 1299 if (babyPatientExtendEarBirth.getBirthDefectType() == 1) {//有
1282 1300 birthDefectType = "有";
1283   - if(StringUtils.isNotEmpty(babyPatientExtendEarBirth.getBirthDefectDesc())){
1284   - birthDefectType = "有,"+babyPatientExtendEarBirth.getBirthDefectDesc();
  1301 + if (StringUtils.isNotEmpty(babyPatientExtendEarBirth.getBirthDefectDesc())) {
  1302 + birthDefectType = "有," + babyPatientExtendEarBirth.getBirthDefectDesc();
1285 1303 }
1286 1304 }
1287 1305 }
1288 1306 babyEarBirthView.setBirthDefectDesc(birthDefectType);
1289 1307  
1290 1308 String birthInjuryType = "无";
1291   - if(babyPatientExtendEarBirth.getBirthInjuryType()!=null){
  1309 + if (babyPatientExtendEarBirth.getBirthInjuryType() != null) {
1292 1310 if (babyPatientExtendEarBirth.getBirthInjuryType() == 1) {//有
1293 1311 birthInjuryType = "有";
1294   - if(StringUtils.isNotEmpty(babyPatientExtendEarBirth.getBirthDefectDesc())){
1295   - birthInjuryType = "有,"+babyPatientExtendEarBirth.getBirthInjuryPosition();
  1312 + if (StringUtils.isNotEmpty(babyPatientExtendEarBirth.getBirthDefectDesc())) {
  1313 + birthInjuryType = "有," + babyPatientExtendEarBirth.getBirthInjuryPosition();
1296 1314 }
1297 1315 }
1298 1316 }
... ... @@ -1589,7 +1607,7 @@
1589 1607 //当前登录人医院Id
1590 1608 String hospitalId = autoMatchFacade.getHospitalId(userId);
1591 1609 //获取机构内同一儿童babyIds
1592   - List<String> babyIds = getBabyIdsByItemOrg(babyId,hospitalId);
  1610 + List<String> babyIds = getBabyIdsByItemOrg(babyId, hospitalId);
1593 1611 query.setBabyIds((String[]) babyIds.toArray(new String[babyIds.size()]));
1594 1612 query.setStatus(0);
1595 1613 query.setSort("create_date");
... ... @@ -1744,7 +1762,7 @@
1744 1762 //听力筛查-当某个儿童在同一院组内某家医院完成了的听筛建档后去院组内其他医院做了听筛、听诊或随访，应该要在对应的医院下创建一个隐藏档案
1745 1763 //建立隐藏档案
1746 1764  
1747   - addhideBabyEar(babyPatientExtendEarScreen.getBabyId(), hId,"2");
  1765 + addhideBabyEar(babyPatientExtendEarScreen.getBabyId(), hId, "2");
1748 1766 } else {
1749 1767 babyPatientExtendEarScreen.setLastUpdateDate(new Date());
1750 1768 babyPatientExtendEarScreen.setLastUpdateUserId(userId + "");
... ... @@ -1891,9 +1909,9 @@
1891 1909 }
1892 1910 String srcResult = "通过";
1893 1911  
1894   - if(earScreen.getScrIspass()!=null){
1895   - if(earScreen.getScrIspass() == 2){//不通过
1896   - srcResult = "未通过";
  1912 + if (earScreen.getScrIspass() != null) {
  1913 + if (earScreen.getScrIspass() == 2) {//不通过
  1914 + srcResult = "未通过";
1897 1915 }
1898 1916 }
1899 1917 screenResult.setSrcResult(srcResult);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/InitFollowUp.java View file @ e1d0f9a
... ... @@ -15,6 +15,16 @@
15 15 private List<Map<String, Object>> confirmResult;
16 16 //确诊时间
17 17 private String confirmData;
  18 + //最后一次听诊时间
  19 + private String diagnoseDate;
  20 +
  21 + public String getDiagnoseDate() {
  22 + return diagnoseDate;
  23 + }
  24 +
  25 + public void setDiagnoseDate(String diagnoseDate) {
  26 + this.diagnoseDate = diagnoseDate;
  27 + }
18 28  
19 29 public String getConfirmData() {
20 30 return confirmData;