diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java index ccd7e03..f52ca40 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -1236,14 +1236,12 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { for (Archive_Master list:archive_masterVos){ commomVo.setPatientId(list.getId()); commomVo.setAdmissTimes(list.getVisitId()); - commomVo.setAdmissId(list.getInpNo()); commomVo.setInpatientNo(list.getInpNo()); commomVo.setName(list.getName()); commomVo.setCheckedDatetime(format1.format(new Date())); commomVo.setSex(list.getSex()); commomVo.setAdmissId(list.getId()); - String substring = list.getSubAssort().substring(0, 2); - commomVo.setAge(substring); + commomVo.setAge(list.getSubAssort()); DateFormat format = new SimpleDateFormat("yyyy-MM-dd"); Date date1=null; Date date2=null; @@ -1262,10 +1260,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { long distanceMin =( ca1.getTimeInMillis()- ca2.getTimeInMillis())/(1000*60*60*24); int i2= (int)distanceMin; commomVo.setAdmissDays(i2); - int i = Integer.parseInt(substring); - int i1 = i * 12; - String s = String.valueOf(i1); - commomVo.setAgeMonth(s); commomVo.setAdmissDate(list.getAdmissionDateTime()); commomVo.setDisDate(list.getDischargeDateTime()); commomVo.setDisDept(list.getDeptName1()); diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index fde6765..80aa3d1 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -1759,10 +1759,10 @@