居民健康管理设备导入添加更新功能

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/device/WlyyDeviceService.java

@@ -192,9 +192,11 @@ public class WlyyDeviceService {
            device.setIsBinding(0);
            //判断设备是否导入
            Integer count = deviceDao.existDeviceCode(device.getDeviceCode());
            if(count == 0) {
                deviceList.add(device);
            if(count != 0) {
                WlyyDevice wlyyDevice = deviceDao.findByDeviceCode(device.getDeviceCode());
                device.setId(wlyyDevice.getId());
            }
            deviceList.add(device);
        }
        deviceDao.save(deviceList);
        return true;

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/survey/ManagerQuestionnaireService.java

@@ -1944,14 +1944,14 @@ public class ManagerQuestionnaireService extends BaseService {
     */
    public String saveQuestionResultAndAnswer(JSONObject jsonData, String patientCode, String customerCode) throws Exception {
        String surveyCode = jsonData.get("surveyCode").toString();
        SurveyTemplates templates = surveyTemplatesDao.findById(surveyCode);
        Survey survey = surveyDao.findById(surveyCode);
        Patient patient = patientDao.findByCode(patientCode);
        User user = userDao.findByCode(customerCode);
        SurveyQuestionResult questionResult =  new SurveyQuestionResult();
        String code = getCode();
        questionResult.setCode(code);
        questionResult.setTemplateCode(templates.getCode());
        questionResult.setTemplateTitle(templates.getTitle());
        questionResult.setTemplateCode(survey.getCode());
        questionResult.setTemplateTitle(survey.getTitle());
        questionResult.setPatientCode(patient.getCode());
        questionResult.setPatientName(patient.getName());
        questionResult.setType(1);