代码修改

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/DsyyPrescriptionService.java

@@ -263,11 +263,25 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
         * @return
         * @throws Exception
         */
    public JSONArray findCardNo(String patient) throws Exception {
    public JSONArray findCardNo(String patient,boolean demoFlag) throws Exception {
        BasePatientDO patientDO = patientDao.getOne(patient);
        if (patientDO==null){
            throw new Exception("不存在该患者！");
        }
        if(demoFlag){
            JSONArray rs =new JSONArray();
            JSONObject jsonObject = new JSONObject();
            jsonObject.put("PAT_NO","P5616242-0");
            jsonObject.put("CARD_NO","D40136791");
            jsonObject.put("CARD_STAT","激活");
            jsonObject.put("OP_DATE","2011-09-27 15:35:57");
            jsonObject.put("CARD_TYPE","2");
            jsonObject.put("CARD_TYPE_NAME","社保卡");
            jsonObject.put("social_no","350211198411053024");
            jsonObject.put("name","白海灵");
            rs.add(jsonObject);
            return rs;
        }
        patientMedicareCardDao.deleteByPatientId(patient);
        JSONArray array = dsyyEntranceService.findCardNo(patientDO.getIdcard());
        for (int i=0;i<array.size();i++){

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/DoctorConsultEndpoint.java

@@ -250,6 +250,8 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
					}else if ("1".equalsIgnoreCase(outpatientDO.getType())){
						consult.setType(1);//图文咨询
					}
				}else if ("4".equalsIgnoreCase(outpatientDO.getOutpatientType())){
					consult.setType(28);//康复咨询
				}else if ("2".equalsIgnoreCase(outpatientDO.getOutpatientType())){
					consult.setType(12);//协同门诊
				}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@@ -446,7 +446,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                }
                return success(jsonArray);
            } else if ("xm_dsyy_wx".equalsIgnoreCase(wxId)) {
                return success(dsyyPrescriptionService.findCardNo(patient));
                return success(dsyyPrescriptionService.findCardNo(patient, demoFlag));
            }else if ("xm_mlwyy_wx".equalsIgnoreCase(wxId)){
                return success(mlwyyPrescriptionService.findPatientCardList(patient));
            } else {

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/health/service/PatientHealthIndexService.java

@@ -410,11 +410,10 @@ public class PatientHealthIndexService {
                String data = item.get("value1").toString();
                String dataType = item.get("value2").toString();
                String deviceSn = item.get("device_sn") == null ? "" : item.get("device_sn").toString();
                Date recordDate = dateFormat6.parse(item.get("record_date").toString());
                Long id = Long.parseLong(item.get("id") + "");
                Date createDate = (Date)item.get("createDate");
                
                String recordTime = DateUtil.dateToStr(recordDate,DateUtil.YYYY_MM_DD);
                String recordTime = item.get("record_date").toString();
                String createTime = DateUtil.dateToStr(createDate,DateUtil.YYYY_MM_DD);
                
                if (data != null && dataType != null) {