代码修改

svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/util/zysoft/SDKRunnerService.java

@@ -71,7 +71,6 @@ public class SDKRunnerService {
//                    new RequestValue("msgBody", "<?xml version=\"1.0\" encoding=\"utf-8\"?><ROOT></ROOT>", true, openCrypto)
                // new RequestValue("idCard", "123", true, openCrypto)
                //实体参数请求示例
//                    new RequestValue("{\"key1\":\"value1\",\"key2\":\"value2\",\"key3\":\"value3\"}")
                for(String key :params.keySet())
                {
                    RequestValue obj = new RequestValue(key,params.get(key),urlEncode,openCrypto);

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/health/controller/DeviceController.java

@@ -1,16 +1,12 @@
package com.yihu.jw.hospital.module.health.controller;
import com.yihu.jw.device.dao.HmTokenDao;
import com.yihu.jw.entity.care.device.Device;
import com.yihu.jw.entity.care.device.DeviceCategory;
import com.yihu.jw.entity.care.device.HmToken;
import com.yihu.jw.hospital.module.common.BaseController;
import com.yihu.jw.hospital.module.health.service.DeviceService;
import com.yihu.jw.util.date.DateUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,9 +23,6 @@ public class DeviceController extends BaseController {
    @Autowired
    private DeviceService deviceService;
    @Autowired
    private HmTokenDao hmTokenDao;
    @ApiOperation("获取设备分类")
    @RequestMapping(value = "DeviceCategory", method = {RequestMethod.POST, RequestMethod.GET})
@@ -64,16 +57,6 @@ public class DeviceController extends BaseController {
                                @RequestParam(value = "id", required = true) String id) {
        try {
            Device device = deviceService.findById(id);
            if(device!=null&&"11".equals(device.getCategoryCode())){
                //华米手表返回 授权到期时间
                HmToken hmToken = hmTokenDao.selectT(getRepUID());
                String authorizationTime = null;
                if(hmToken!=null&& StringUtils.isNotBlank(hmToken.getExpiresIn())){
                    authorizationTime = DateUtil.dateAddByType(hmToken.getCreateTime(),"1",Long.parseLong(hmToken.getExpiresIn()));
                    device.setAuthorizationTime(authorizationTime);
                }
            }
            return write(200, "查询成功", "data", device);
        } catch (Exception ex) {
            return invalidUserException(ex, -1, ex.getMessage());

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/rehabilitation/controller/DoctorRehabilitaionInfoController.java

@@ -386,18 +386,6 @@ public class DoctorRehabilitaionInfoController extends EnvelopRestEndpoint {
        }
    }
    @RequestMapping(value = "ttt", method = RequestMethod.GET)
    @ApiOperation("添加编辑住院病历")
    public String ttt() {
        try {
            return write(200, "添加成功", "data", rehabilitationInfoService.findByCode("2c53ebdec84747d48526abc40702c395"));
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1, "添加失败");
        }
    }
    @RequestMapping(value = "createMedicalRecords", method = RequestMethod.POST)
    @ApiOperation("添加编辑住院病历")
    public String createMedicalRecords(

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/rehabilitation/service/RehabilitationInfoService.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.door.SignFamily;
import com.yihu.jw.entity.rehabilitation.PatientDischargeDO;
import com.yihu.jw.entity.specialist.rehabilitation.PatientMedicalRecordsDO;
import com.yihu.jw.entity.specialist.rehabilitation.RehabilitationAdviceDO;
@@ -18,14 +17,11 @@ import com.yihu.jw.hospital.module.rehabilitation.dao.RehabilitationPatientInfoD
import com.yihu.jw.hospital.module.specialist.dao.PatientMedicalRecordsRehabilitationDao;
import com.yihu.jw.hospital.module.system.dao.SystemDictDao;
import com.yihu.jw.hospital.task.PushMsgTask;
import com.yihu.jw.hospital.team.dao.WlyySignFamilyDao;
import com.yihu.jw.hospital.utils.WeiXinAccessTokenUtils;
import com.yihu.jw.hospital.utils.WeiXinOpenIdUtils;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.patient.service.BasePatientService;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.http.HttpClientUtil;
import com.yihu.jw.wlyy.service.WlyyBusinessService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -56,18 +52,12 @@ public class RehabilitationInfoService {
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private HttpClientUtil httpClientUtil;
    @Autowired
    private BasePatientService patientService;
    @Autowired
    private SystemDictDao systemDictDao;
    @Autowired
    private BaseDoctorDao doctorDao;
    @Autowired
    private BasePatientDao patientDao;
    @Autowired
    private WlyySignFamilyDao signFamilyDao;
    @Autowired
    private RehabilitationAdviceDao adviceDao;
    @Autowired
    private PatientMedicalRecordsRehabilitationDao patientMedicalRecordsDao;
@@ -277,17 +267,8 @@ public class RehabilitationInfoService {
            Integer age = IdCardUtil.getAgeForIdcard(idcard);
            jsonObject.put("sex", sex);
            jsonObject.put("age", age);
            SignFamily signFamily = signFamilyDao.getExpensesSignByIdcard(idcard);
            if (signFamily != null) {
                jsonObject.put("doctorName", signFamily.getDoctorName() + "(全科医生)");
                if (StringUtils.isNotBlank(signFamily.getDoctorHealthName())) {
                    jsonObject.put("doctorHealthName", signFamily.getDoctorHealthName() + "(健管师)");
                }
                jsonObject.put("hospitalName", signFamily.getHospitalName());
                signList.add(jsonObject);
            } else {
                nosignList.add(jsonObject);
            }
            nosignList.add(jsonObject);
        }
        result.put("noSignArray", nosignList);
        result.put("signArray", signList);