Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

Conflicts:
	svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/sign/CapacityAssessmentRecordService.java

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/dao/label/WlyyPatientLabelDao.java

@@ -14,8 +14,8 @@ import java.util.List;
public interface WlyyPatientLabelDao extends PagingAndSortingRepository<WlyyPatientLabelDO, String>, JpaSpecificationExecutor<WlyyPatientLabelDO> {
    @Modifying
    @Query("delete WlyyPatientLabelDO a where a.patient=?1")
    int deleteByPatient(String patient) throws Exception;
    @Query("delete WlyyPatientLabelDO a where a.patient=?1 and a.labelType=?2")
    int deleteByPatientAndLabelType(String patient,String labelType) throws Exception;
    @Query("from WlyyPatientLabelDO w where  w.patient=?1 ")
    List<WlyyPatientLabelDO> findByPatient(String patient);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/patient/CarePatientService.java

@@ -174,13 +174,14 @@ public class CarePatientService extends BaseJpaService<BasePatientDO, BasePatien
     */
    @Transactional(rollbackFor = Exception.class)
    public void updPatientLabel(String jsonData,String patientId) throws Exception{
        patientLabelDao.deleteByPatient(patientId);
        patientLabelDao.deleteByPatientAndLabelType(patientId,"2");
        JSONArray jsonArray = JSON.parseArray(jsonData);
        List<WlyyPatientLabelDO> labelDOList = new ArrayList<>();
        for (int i=0;i<jsonArray.size();i++){
            WlyyPatientLabelDO labelDO = JSONObject.parseObject(jsonArray.getJSONObject(i).toJSONString(), WlyyPatientLabelDO.class);
            labelDO.setPatient(patientId);
            labelDO.setCzrq(new Date());
            labelDO.setLabelType("2");
            labelDOList.add(labelDO);
        }
        patientLabelDao.save(labelDOList);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/sign/CapacityAssessmentRecordService.java

@@ -78,7 +78,7 @@ public class CapacityAssessmentRecordService extends BaseJpaService<CapacityAsse
    /**
     * 按id查找评估明细
     * @param id
     * @param patient
     * @return
     */
    public CapacityAssessmentRecordDO findAssessmentByPatientId(String patient)  {
@@ -239,7 +239,7 @@ public class CapacityAssessmentRecordService extends BaseJpaService<CapacityAsse
            capacityAssessmentRecordDao.save(recordDO);
            //生成居民标签
            patientLabelDao.deleteByPatient(recordDO.getPatient());
            patientLabelDao.deleteByPatientAndLabelType(recordDO.getPatient(),"1");
            WlyyPatientLabelDO patientLabelDO = new WlyyPatientLabelDO();
            patientLabelDO.setCzrq(new Date());
            patientLabelDO.setLabelType("1");
@@ -336,7 +336,7 @@ public class CapacityAssessmentRecordService extends BaseJpaService<CapacityAsse
                    recordDO.setStatus(0);
                    capacityAssessmentRecordDao.save(recordDO);
                    //生成居民标签
                    patientLabelDao.deleteByPatient(recordDO.getPatient());
                    patientLabelDao.deleteByPatientAndLabelType(recordDO.getPatient(),"1");
                    WlyyPatientLabelDO patientLabelDO = new WlyyPatientLabelDO();
                    patientLabelDO.setCzrq(new Date());
                    patientLabelDO.setLabelType("1");
@@ -474,7 +474,9 @@ public class CapacityAssessmentRecordService extends BaseJpaService<CapacityAsse
            if (allSearch){
                tmpItem++;
            }
            else break;
            else{
                break;
            }
        }
        return result;
    }