liquanyu / regional-platform

Authored by liquanyu over 8 years ago

Showing 2 changed files with 6 additions and 2 deletions

...	...	@@ -534,7 +534,7 @@
534	534	for (Map<String,Object> map : list)
535	535	{
536	536	Map<String,Object> result = new HashMap<>();
537		- result.put("createDate", map.get("CREATE_DATE") == null ? "" : DateUtil.getyyyy_MM_dd((Date)map.get("CREATE_DATE"))); //建档日期
	537	+ result.put("createDate", map.get("CREATE_DATE")); //建档日期
538	538	result.put("name", map.get("NAME")); //姓名
539	539	result.put("buildWeek", map.get("YZ_NAME")); //建档孕周
540	540	result.put("hospitalName", map.get("HOSPITAL_NAME")); //建档机构
...	...	@@ -814,7 +814,7 @@
814	814	for (Map<String,Object> map : ticketList)
815	815	{
816	816	Map<String,Object> result = new HashMap<>();
817		- result.put("examineDate", map.get("EXAMINE_DATE") == null ? "" : DateUtil.getyyyy_MM_dd((Date)map.get("EXAMINE_DATE"))); //产检日期
	817	+ result.put("examineDate", map.get("EXAMINE_DATE")); //产检日期
818	818	result.put("name", map.get("NAME")); //姓名
819	819	result.put("checkWeek", map.get("YZ_NAME")); //产检孕周
820	820	result.put("examineHistoryNum", map.get("EXAMINE_HISTORY_NUM")); //产检第次

...	...	@@ -107,6 +107,8 @@
107	107	private SieveService sieveService;
108	108	@Autowired
109	109	private OrganizationGroupsFacade groupsFacade;
	110	+ @Autowired
	111	+ private OperateLogFacade operateLogFacade;
110	112
111	113	@Autowired
112	114	private AutoIncermentService autoIncermentService;
...	...	@@ -248,6 +250,8 @@
248	250	patient.setModified(new Date());
249	251	patient.setOperator(userId);
250	252	Patients p = yunBookbuildingService.addPregnantBookbuilding(patient);
	253	+
	254	+// operateLogFacade.addOptLog(userId,Integer.valueOf(yunRequest.getHospitalId()),JsonUtil.array2JsonString(p),"",OptActionEnums.ADD.getId(),"");
251	255
252	256	/** 孕妇建档后把所有以前未使用的优惠券作废 */
253	257	couponService.invalid(p.getPid(), "1,2,3,4,5,6,7,8");